Repository: arthuro555/pokemonlib (language: python)

Issue:
MAKE TRAVISCI FINALLY WORK
OH BOI


Discussion / hints:

Fix patch:
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
new file mode 100644
index 0000000..349fca0
--- /dev/null
+++ b/.github/workflows/pythonpackage.yml
@@ -0,0 +1,26 @@
+name: Python package
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [pypy3, 3.5, 3.6, 3.7]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Test with pytest
+      run: |
+        python test.py
diff --git a/.gitignore b/.gitignore
index fcf301f..600a2a9 100644
Binary files a/.gitignore and b/.gitignore differ
diff --git a/.idea/dictionaries/pc.xml b/.idea/dictionaries/pc.xml
index ef0156c..5cc4b66 100644
--- a/.idea/dictionaries/pc.xml
+++ b/.idea/dictionaries/pc.xml
@@ -27,6 +27,8 @@
       <w>pokemonlib</w>
       <w>pokemonlist</w>
       <w>pokemons</w>
+      <w>pokeproject</w>
+      <w>projectname</w>
       <w>pyarmor</w>
       <w>pyglet</w>
       <w>templist</w>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index e63a241..3ddf0ea 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,17 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="pyarmor" />
+            <item index="1" class="java.lang.String" itemvalue="cryptography" />
+            <item index="2" class="java.lang.String" itemvalue="click" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
     <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="ignoredErrors">
         <list>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f089b6f..021f4cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (poke et mon)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (poke et mon)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/poke et mon.iml b/.idea/poke et mon.iml
index e9cab1d..14ed926 100644
--- a/.idea/poke et mon.iml
+++ b/.idea/poke et mon.iml
@@ -4,10 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.7 (poke et mon)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.8 (poke et mon)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
 </module>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 2fe0f76..7dfdce2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ deploy:
     api_key:
       secure: c9QGhPbFy0k+BkitBwPGqe79b2HLbyFZpBQjLsggS6BpHUe5qPLM9CRQV9SYd2kOMipuTGoKJRFo+JMmgP9Hf++nspKr7FcEHdn7HwQTwPJIhDoAp+ircZOJLNA8iP28W4wW3PYKPKZuX8nJFWcsh7/e+gSFFkl9Mb5JS/uzxW7JTjXawEBpC9rSKw5MYrcn0mvrN/M/Z/tTbT0NKfKZcmF4in/XCZHNDSD5EBhnnXNRZ3evFuXZFTSSvKwnYjwiwD9Vo53TDkd17B1kHwcoo9/c+okitIJmMDBTwSaWv7x8YkL5BYYhJ1dL+bCOTCZnIUY1RxIDb5T6f8TaWN3Ty2PRjZSKmw5yj/XjGLrtTMGRmuDzxo3Ao3HK5LgjgD0Zqh0QIvIlgWSuUJw56FnfzD5JDmStcA/ypyyPOvBaH5hH2dzcOPy5hHP3cuwrleUtupD9+F8ZbLeWkxqzWTczQjpujqOXyaYYXeiA+zaMtOUVKdJfj+rNEGXRXHN+hpPKbjVXouvjoP3LxnP0Q6EudO/Ck/+vpMjac8Dr4OI+ed2W+CuQSIrCIQIJ64DTDJNVQGT5a+JQxaqxfAVV3U3jjpxRBb32ht0sP9Wptcz2+BednbCoTyxbE/5sw9JvpKiV13fXORE8wRBB1RIHdeQ84aEXSM4+tv9grkiY7UXyBIs=
     file: dist/pokemonlib-*.tar.gz
+    skip_cleanup: true
     on:
       repo: arthuro555/pokemonlib
       branch: release
diff --git a/README.md b/README.md
index 2507652..01a1d1e 100644
--- a/README.md
+++ b/README.md
@@ -52,27 +52,8 @@ as contributors of this repo. If someone contributes to the project by more than
 something really useful (like some english teacher who fixes all the typos) I will add them to a credit section
 and a file credits.txt.
 
-**WARNING** I have some conditions for contributions.
-
-1. Explain thoroughly what you changed/implemented, how and if it's not on my feature board on that file also why.
-2. Don't ask me questions on the code I don't have much free time and I prefer to use them to code myself.
-3. I probably won't document very much changes I do to the code and don't complain.
-4. Unless I make someone a contributor, This will stay **_my_** project and any code pushed by someone else will be
-considered as 'Donated' and will become mine. You accept by pushing anything here to give up on any copyright
-or rights that you own on the code you added/modified. I don't want my project to be steeled.
-5. I'm (With contributors if I add some) the one(s) that decide if someone should be added/removed from the credits.
-I am not obligated to let someone who contributed to the project on the list if I judge that wasn't enough because
-else the list could become too long and I don't want people's name that made real and good contributions to be
-hidden by hundreds of names of people that changed 2 characters.
-6. I'm the only one to decide if someone should be a contributor or not.
-7. DON'T COMPLAIN ON ANYTHING. IF YOU MAKE A CONTRIBUTION IT'S YOUR CHOICE AND AS THIS CONDITIONS WERE HERE
-SINCE THE FIRST COMMIT SO YOU KNEW THE CONDITIONS
-
 ### What this project is meant to become
 
 This project is for now pieces of code on which you can use to make a simple pokemon game.
-I want it to become a piece of software that you extend with your own script(s) and plugins.
-A bit like renpy. If it goes on so far that all the 'Core' stuff is done and also the 'Graphical' part I would
-want to make directly a 'Programming Language' for it (Just something to parse some pre defined syntax and connect it
-with the 'Core' API) or a visual editor (Like idk Geometry dash). Keep the goal in mind if you make contributions
-because if they are not compatible with my goals I will have to reject them.
+I want it to become a piece of software that you extend with your own script(s) and plugins, a bit like renpy. 
+If I manage to finish all the core and Engine part maybe a visual editor will be made. 
diff --git a/build/lib/pokemonlib/GameClasses/UIClass.py b/build/lib/pokemonlib/GameClasses/UIClass.py
deleted file mode 100644
index cf3c7ac..0000000
--- a/build/lib/pokemonlib/GameClasses/UIClass.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from kivy.app import App
-from kivy.uix.widget import Widget
-from kivy.graphics import Rectangle
-
-
-class GameWidget(Widget):
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-        with self.canvas:
-            Rectangle(pos=(0,0), size=(100,100))
-
-
-class GameUI(App):
-    def build(self):
-        return GameWidget()
-
-
-app = GameUI()
-app.run()
-
-def graphictest():
-    a
\ No newline at end of file
diff --git a/build/lib/pokemonlib/main.py b/build/lib/pokemonlib/main.py
deleted file mode 100644
index 0ad902b..0000000
--- a/build/lib/pokemonlib/main.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import logging
-import configparser
-
-from .pokemonDataDownload import GetPokeAPI as PkApi
-from .GameClasses import PokemonClass as Pkmn
-from .GameClasses import UIClass as UI
-
-
-log = logging.getLogger("Main")
-log.setLevel(logging.DEBUG)
-
-# Read the config.ini file to decide if pokemons should be updated
-config = configparser.ConfigParser()
-config.read('config.ini')
-
-if config.sections() == []:  # If config is Null Create it with default parameters
-
-    config["Config Version"] = {  # Used to check if this config is compatible with the current software version.
-        "version (DON'T MODIFY)": 1
-    }
-    config["Updater"] = {
-        "auto-update pokemons": True,
-        "auto-update attacks": False,
-    }
-    config["Modules To Start"] = {
-        "UI": True,
-        "Pokemon Class Test": True,
-    }
-    with open("config.ini", "w") as f:
-        config.write(f)
-    log.info("Created new config file")
-    input("Press Enter when you finished editing your config file.")
-
-
-try:
-
-    if config["Updater"]["auto-update pokemons"] == True:
-        PkApi.pokegetapi()
-
-    if config["Updater"]["auto-update attacks"] == True:
-        raise NotImplementedError("Attacks are not implemented for the moment")
-
-    if config["Modules To Start"]["UI"] == True:
-        log.debug("Starting graphic Test.")
-        UI.graphictest()
-
-    if config["Modules To Start"]["Pokemon Class Test"] == True:
-        Pkmn.testPokemonClass(log)
-
-except KeyError:  # If one of the keys aaren't found then Use default config
-    # Log the error as "Warning" for the user to use a correct config
-    log.error("Invalid config File. Using default configuration. To create a new config file, delete the old"+""
-              " config.ini")
diff --git a/build/lib/pokemonlib/misc/Exeptions.py b/build/lib/pokemonlib/misc/Exeptions.py
deleted file mode 100644
index 2bb41b6..0000000
--- a/build/lib/pokemonlib/misc/Exeptions.py
+++ /dev/null
@@ -1,18 +0,0 @@
-class IdNotReferenced(Exception):
-    pass
-
-
-class InvalidPokemonData(Exception):
-    pass
-
-
-class NotAPokemon(Exception):
-    pass
-
-
-class InvalidInput(Exception):
-    pass
-
-
-class ListFull(Exception):
-    pass
diff --git a/build/lib/pokemonlib/misc/Security.py b/build/lib/pokemonlib/misc/Security.py
deleted file mode 100644
index 01c2500..0000000
--- a/build/lib/pokemonlib/misc/Security.py
+++ /dev/null
@@ -1,96 +0,0 @@
-import base64
-import os
-
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
-from cryptography.fernet import Fernet
-
-from pokemonlib.misc import Settings
-
-
-def getkey(password_provided):
-    """
-    You don't need this, It's automatically called by the encryption functions. It creates the encryption key from the
-    salt and password in misc.Settings.
-
-    :param password_provided:
-    :return:
-    """
-
-    password = password_provided.encode()  # Convert to type bytes
-    salt = Settings.SALT.encode()  # CHANGE THIS - recommend using a key from os.urandom(16), must be of type bytes
-    kdf = PBKDF2HMAC(
-        algorithm=hashes.SHA256(),
-        length=32,
-        salt=salt,
-        iterations=100000,
-        backend=default_backend()
-    )
-    key = base64.urlsafe_b64encode(kdf.derive(password))  # Can only use kdf once
-    return key
-
-
-def encrypt(message, password):
-    """
-    You can use this for protecting player files. The user then enters the password to be passed. This isn't useful if
-    the user doesn't/can't enter a password at some time.
-
-    :param message:
-    :param password:
-    :return:
-    """
-
-    message = message.encode()
-
-    f = Fernet(getkey(password))
-    encrypted = f.encrypt(message)
-    return encrypted
-
-
-def encrypt_default_password(message):
-    """
-    You Can Use this for internal data (Aka Non-User controlled data) that needs to be encrypted.
-
-    :param message:
-    :return:
-    """
-
-    message = message.encode()
-
-    f = Fernet(getkey(Settings.ENCRYPTION_PASSWORD))
-    encrypted = f.encrypt(message)
-    return encrypted
-
-
-def decrypt(message, password):
-    """
-    You can use this for reading protected player files. The user then enters the password to be passed. This isn't
-    useful if the user doesn't/can't enter a password at some time.
-
-    :param message:
-    :param password:
-    :return:
-    """
-
-    if type(message) == bytes:
-        f = Fernet(getkey(Settings.ENCRYPTION_PASSWORD))
-        decrypted = f.decrypt(message)
-    else:
-        raise TypeError("Passed a string object to a function accepting only bytes objects as input.")
-
-
-def decrypt_default_password(message):
-    """
-    You Can Use this for internal data (Aka Non-User controlled data) that needs to be encrypted.
-
-    :param message:
-    :return:
-    """
-
-    if type(message) == bytes:
-        f = Fernet(getkey(Settings.ENCRYPTION_PASSWORD))
-        decrypted = f.decrypt(message)
-        return decrypted
-    else:
-        raise TypeError("Passed a string object to a function accepting only bytes objects as input.")
diff --git a/build/lib/pokemonlib/misc/Settings.py b/build/lib/pokemonlib/misc/Settings.py
deleted file mode 100644
index 2f1a245..0000000
--- a/build/lib/pokemonlib/misc/Settings.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Encryption. DON'T MODIFY AFTER FIRST RELEASE OR SAVES WON'T WORK ANYMORE!!!
-SALT = "HbhlhvHVJHGvkGvkgCVkgCKGckgtcRsus4i87t97fryZdxikTcirsrTFfsr6X"  # Make a random value
-ENCRYPTION_PASSWORD = "password"  # Make whatever you want with this.
-
-# Saves
-POKEMON_LIKE_SAVES = True  # This option enables saves working the same way as in pokemon games, aka 1 save file that
-# Gets overridden each time you save
-ANTI_CHEAT = False  # Use only if you REALLY don't want cheaters. This will add variables to __builtins__ to make more
-# checks on save files before loading them. It's highly inadvisable to touch at __builtins__ normally.
-ENABLE_AUTO_ENCRYPTION_FOR_SAVE_FILES = True  # Unless you want to mess around with your save file let it on True.
diff --git a/build/lib/pokemonlib/pokemonDataDownload/GetPokeAPI.py b/build/lib/pokemonlib/pokemonDataDownload/GetPokeAPI.py
deleted file mode 100644
index 0dbd067..0000000
--- a/build/lib/pokemonlib/pokemonDataDownload/GetPokeAPI.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import requests
-import json
-import os
-
-
-def pokedatagetfromapi():
-
-    for idn in range(0, 807):  # For all existing pokemon
-        ff = False  # Reset this variable used to verify if first iteration of next for loop
-        types = []  # Reset type list
-        p_type = " "  # Reset the string that will be printed
-        stats = {}  # Reset dictionary responsible for pokemon statistics
-        # idn += 1   idk anymore why I added that
-
-        response = requests.get("https://pokeapi.co/api/v2/pokemon/"+str(idn)+"/")  # Get data in json from the api
-
-        for x in response.json()["types"]:  # For each type the pokemon has
-            if ff:  # if not first iteration
-                p_type += " and "  # add an "and" in the string that will be printed
-            ff = True  # Variable changed: Not first iteration
-            p_type += str(x["type"]["name"])  # add the type of th pokemon to what will be printed
-            types.append(str(x["type"]["name"]))  # transfer the values to another list
-        name = response.json()["name"]  # Get the pokemon's name
-
-        # print out the data collected
-        print("Pokemon with id " + str(idn) + " is named " + name + ", and is a" + p_type + " type pokemon_data.")
-
-        for x in response.json()["stats"]:  # for each stat of the pokemon
-            stats[x["stat"]["name"]] = x["base_stat"]  # add the base stat in a dictionary with stat name as key
-
-        # make a final dictionary containing all the needed data
-        pokedata = {"name": name, "types": types, "stats": stats}
-
-        path = os.getcwd()  # Gets the relative path from main.py
-
-        # Decides if using \ for windows or / for mac and linux in the path
-        if os.name == "nt":
-            otherpath = path + "pokemonlib\\pokemon_data\\"
-            path += "pokemonlib\\pokemon_data\\pokemon_properties\\"
-        else:
-            otherpath = path + "pokemonlib/pokemon_data/"
-            path += "pokemonlib/pokemon_data/pokemon_properties/"
-
-        try:
-            # Save the pokedata variable as json
-            with open(path + "/pokemon_" + str(idn) + ".json", "w+") as f:
-                json.dump(pokedata, f)
-
-            print("Saved " + str(idn))
-
-        except FileNotFoundError:  # If directory doesn't exist
-            os.mkdir(otherpath)  # create the pokemon_data directory
-            os.mkdir(path)  # create the pokemon_properties sub-directory
-
-            with open(path + "/pokemon_" + str(idn) + ".json", "w+") as f:  # Now try again to save
-                json.dump(pokedata, f)
-
-            print("Saved " + str(idn))
diff --git a/buildozer.spec b/buildozer.spec
deleted file mode 100644
index ad9720e..0000000
--- a/buildozer.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-[app]
-
-# (str) Title of your application
-title = Pokemolib Example Game
-
-# (str) Package name
-package.name = PokemonLibGame
-
-# (str) Package domain (needed for android/ios packaging)
-package.domain = org.Lapinux
-
-# (str) Source code where the main.py live
-source.dir = pokemonlib
-
-# (list) Source files to include (let empty to include all the files)
-source.include_exts =
-
-# (list) List of inclusions using pattern matching
-#source.include_patterns = assets/*,images/*.png
-
-# (list) Source files to exclude (let empty to not exclude anything)
-#source.exclude_exts = spec
-
-# (list) List of directory to exclude (let empty to not exclude anything)
-#source.exclude_dirs = tests, bin
-
-# (list) List of exclusions using pattern matching
-#source.exclude_patterns = license,images/*/*.jpg
-
-# (str) Application versioning (method 1)
-version = 0.1
-
-# (str) Application versioning (method 2)
-# version.regex = __version__ = ['"](.*)['"]
-# version.filename = %(source.dir)s/main.py
-
-# (list) Application requirements
-# comma separated e.g. requirements = sqlite3,kivy
-requirements = python3,requests,kivy
-
-# (str) Custom source folders for requirements
-# Sets custom source for any requirements with recipes
-# requirements.source.kivy = ../../kivy
-
-# (list) Garden requirements
-#garden_requirements =
-
-# (str) Presplash of the application
-#presplash.filename = %(source.dir)s/data/presplash.png
-
-# (str) Icon of the application
-#icon.filename = %(source.dir)s/data/icon.png
-
-# (str) Supported orientation (one of landscape, sensorLandscape, portrait or all)
-orientation = portrait
-
-# (list) List of service to declare
-#services = NAME:ENTRYPOINT_TO_PY,NAME2:ENTRYPOINT2_TO_PY
-
-#
-# OSX Specific
-#
-
-#
-# author = © Copyright Info
-
-# change the major version of python used by the app
-osx.python_version = 3
-
-# Kivy version to use
-osx.kivy_version = 1.9.1
-
-#
-# Android specific
-#
-
-# (bool) Indicate if the application should be fullscreen or not
-fullscreen = 0
-
-# (string) Presplash background color (for new android toolchain)
-# Supported formats are: #RRGGBB #AARRGGBB or one of the following names:
-# red, blue, green, black, white, gray, cyan, magenta, yellow, lightgray,
-# darkgray, grey, lightgrey, darkgrey, aqua, fuchsia, lime, maroon, navy,
-# olive, purple, silver, teal.
-#android.presplash_color = #FFFFFF
-
-# (list) Permissions
-#android.permissions = INTERNET
-
-# (int) Target Android API, should be as high as possible.
-#android.api = 27
-
-# (int) Minimum API your APK will support.
-#android.minapi = 21
-
-# (int) Android SDK version to use
-#android.sdk = 20
-
-# (str) Android NDK version to use
-#android.ndk = 17c
-
-# (int) Android NDK API to use. This is the minimum API your app will support, it should usually match android.minapi.
-#android.ndk_api = 21
-
-# (bool) Use --private data storage (True) or --dir public storage (False)
-#android.private_storage = True
-
-# (str) Android NDK directory (if empty, it will be automatically downloaded.)
-#android.ndk_path =
-
-# (str) Android SDK directory (if empty, it will be automatically downloaded.)
-#android.sdk_path =
-
-# (str) ANT directory (if empty, it will be automatically downloaded.)
-#android.ant_path =
-
-# (bool) If True, then skip trying to update the Android sdk
-# This can be useful to avoid excess Internet downloads or save time
-# when an update is due and you just want to test/build your package
-# android.skip_update = False
-
-# (bool) If True, then automatically accept SDK license
-# agreements. This is intended for automation only. If set to False,
-# the default, you will be shown the license when first running
-# buildozer.
-# android.accept_sdk_license = False
-
-# (str) Android entry point, default is ok for Kivy-based app
-#android.entrypoint = org.renpy.android.PythonActivity
-
-# (list) Pattern to whitelist for the whole project
-#android.whitelist =
-
-# (str) Path to a custom whitelist file
-#android.whitelist_src =
-
-# (str) Path to a custom blacklist file
-#android.blacklist_src =
-
-# (list) List of Java .jar files to add to the libs so that pyjnius can access
-# their classes. Don't add jars that you do not need, since extra jars can slow
-# down the build process. Allows wildcards matching, for example:
-# OUYA-ODK/libs/*.jar
-#android.add_jars = foo.jar,bar.jar,path/to/more/*.jar
-
-# (list) List of Java files to add to the android project (can be java or a
-# directory containing the files)
-#android.add_src =
-
-# (list) Android AAR archives to add (currently works only with sdl2_gradle
-# bootstrap)
-#android.add_aars =
-
-# (list) Gradle dependencies to add (currently works only with sdl2_gradle
-# bootstrap)
-#android.gradle_dependencies =
-
-# (list) Java classes to add as activities to the manifest.
-#android.add_activites = com.example.ExampleActivity
-
-# (str) python-for-android branch to use, defaults to master
-#p4a.branch = master
-
-# (str) OUYA Console category. Should be one of GAME or APP
-# If you leave this blank, OUYA support will not be enabled
-#android.ouya.category = GAME
-
-# (str) Filename of OUYA Console icon. It must be a 732x412 png image.
-#android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png
-
-# (str) XML file to include as an intent filters in <activity> tag
-#android.manifest.intent_filters =
-
-# (str) launchMode to set for the main activity
-#android.manifest.launch_mode = standard
-
-# (list) Android additional libraries to copy into libs/armeabi
-#android.add_libs_armeabi = libs/android/*.so
-#android.add_libs_armeabi_v7a = libs/android-v7/*.so
-#android.add_libs_x86 = libs/android-x86/*.so
-#android.add_libs_mips = libs/android-mips/*.so
-
-# (bool) Indicate whether the screen should stay on
-# Don't forget to add the WAKE_LOCK permission if you set this to True
-#android.wakelock = False
-
-# (list) Android application meta-data to set (key=value format)
-#android.meta_data =
-
-# (list) Android library project to add (will be added in the
-# project.properties automatically.)
-#android.library_references =
-
-# (str) Android logcat filters to use
-#android.logcat_filters = *:S python:D
-
-# (bool) Copy library instead of making a libpymodules.so
-#android.copy_libs = 1
-
-# (str) The Android arch to build for, choices: armeabi-v7a, arm64-v8a, x86
-android.arch = armeabi-v7a
-
-#
-# Python for android (p4a) specific
-#
-
-# (str) python-for-android git clone directory (if empty, it will be automatically cloned from github)
-#p4a.source_dir =
-
-# (str) The directory in which python-for-android should look for your own build recipes (if any)
-#p4a.local_recipes =
-
-# (str) Filename to the hook for p4a
-#p4a.hook =
-
-# (str) Bootstrap to use for android builds
-# p4a.bootstrap = sdl2
-
-# (int) port number to specify an explicit --port= p4a argument (eg for bootstrap flask)
-#p4a.port =
-
-
-#
-# iOS specific
-#
-
-# (str) Path to a custom kivy-ios folder
-#ios.kivy_ios_dir = ../kivy-ios
-# Alternately, specify the URL and branch of a git checkout:
-ios.kivy_ios_url = https://github.com/kivy/kivy-ios
-ios.kivy_ios_branch = master
-
-# Another platform dependency: ios-deploy
-# Uncomment to use a custom checkout
-#ios.ios_deploy_dir = ../ios_deploy
-# Or specify URL and branch
-ios.ios_deploy_url = https://github.com/phonegap/ios-deploy
-ios.ios_deploy_branch = 1.7.0
-
-# (str) Name of the certificate to use for signing the debug version
-# Get a list of available identities: buildozer ios list_identities
-#ios.codesign.debug = "iPhone Developer: <lastname> <firstname> (<hexstring>)"
-
-# (str) Name of the certificate to use for signing the release version
-#ios.codesign.release = %(ios.codesign.debug)s
-
-
-[buildozer]
-
-# (int) Log level (0 = error only, 1 = info, 2 = debug (with command output))
-log_level = 1
-
-# (int) Display warning if buildozer is run as root (0 = False, 1 = True)
-warn_on_root = 1
-
-# (str) Path to build artifact storage, absolute or relative to spec file
-# build_dir = ./.buildozer
-
-# (str) Path to build output (i.e. .apk, .ipa) storage
-# bin_dir = ./bin
-
-#    -----------------------------------------------------------------------------
-#    List as sections
-#
-#    You can define all the "list" as [section:key].
-#    Each line will be considered as a option to the list.
-#    Let's take [app] / source.exclude_patterns.
-#    Instead of doing:
-#
-#[app]
-#source.exclude_patterns = license,data/audio/*.wav,data/images/original/*
-#
-#    This can be translated into:
-#
-#[app:source.exclude_patterns]
-#license
-#data/audio/*.wav
-#data/images/original/*
-#
-
-
-#    -----------------------------------------------------------------------------
-#    Profiles
-#
-#    You can extend section / key with a profile
-#    For example, you want to deploy a demo version of your application without
-#    HD content. You could first change the title to add "(demo)" in the name
-#    and extend the excluded directories to remove the HD content.
-#
-#[app@demo]
-#title = My Application (demo)
-#
-#[app:source.exclude_patterns@demo]
-#images/hd/*
-#
-#    Then, invoke the command line with the "demo" profile:
-#
-#buildozer --profile demo android debug
diff --git a/config.ini b/config.ini
deleted file mode 100644
index b1a3520..0000000
--- a/config.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Config Version]
-version (don't modify) = 1
-
-[Updater]
-auto-update pokemons = False
-auto-update attacks = False
-
-[Modules To Start]
-ui = True
-pokemon class test = False
-
diff --git a/dist/pokemonlib-0.0.2.tar.gz b/dist/pokemonlib-0.0.2.tar.gz
deleted file mode 100644
index 1633d3b..0000000
Binary files a/dist/pokemonlib-0.0.2.tar.gz and /dev/null differ
diff --git a/dist/pokemonlib-0.0.2.win-amd64.zip b/dist/pokemonlib-0.0.2.win-amd64.zip
deleted file mode 100644
index f887acb..0000000
Binary files a/dist/pokemonlib-0.0.2.win-amd64.zip and /dev/null differ
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..d0c3cbf
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/make.bat b/docs/make.bat
new file mode 100644
index 0000000..9534b01
--- /dev/null
+++ b/docs/make.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd
diff --git a/docs/source/Makefile b/docs/source/Makefile
new file mode 100644
index 0000000..d4bb2cb
--- /dev/null
+++ b/docs/source/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/source/conf.py b/docs/source/conf.py
new file mode 100644
index 0000000..15f524e
--- /dev/null
+++ b/docs/source/conf.py
@@ -0,0 +1,66 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+import os
+import sys
+sys.path.insert(0, os.path.abspath("../.."))
+
+
+# -- Project information -----------------------------------------------------
+
+project = 'Pokemonlib'
+copyright = '2019, Arthur Pacaud (arthuro555)'
+author = 'Arthur Pacaud (arthuro555)'
+
+
+# -- General configuration ---------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.viewcode',
+    'sphinx.ext.todo',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = 'en'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'default'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+
+# -- Extension configuration -------------------------------------------------
+
+todo_include_todos = True
diff --git a/docs/source/contents.rst b/docs/source/contents.rst
new file mode 100644
index 0000000..61bda7f
--- /dev/null
+++ b/docs/source/contents.rst
@@ -0,0 +1,21 @@
+.. pokemonlib documentation master file, created by
+   sphinx-quickstart on Sun Sep  8 10:27:55 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to pokemonlib's documentation!
+======================================
+
+.. toctree::
+   :maxdepth: 4
+   :caption: Contents:
+
+   pokemonlib
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/docs/source/index.rst b/docs/source/index.rst
new file mode 100644
index 0000000..61bda7f
--- /dev/null
+++ b/docs/source/index.rst
@@ -0,0 +1,21 @@
+.. pokemonlib documentation master file, created by
+   sphinx-quickstart on Sun Sep  8 10:27:55 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to pokemonlib's documentation!
+======================================
+
+.. toctree::
+   :maxdepth: 4
+   :caption: Contents:
+
+   pokemonlib
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/docs/source/make.bat b/docs/source/make.bat
new file mode 100644
index 0000000..922152e
--- /dev/null
+++ b/docs/source/make.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd
diff --git a/docs/source/modules.rst b/docs/source/modules.rst
new file mode 100644
index 0000000..271f064
--- /dev/null
+++ b/docs/source/modules.rst
@@ -0,0 +1,7 @@
+pokemonlib
+==========
+
+.. toctree::
+   :maxdepth: 4
+
+   pokemonlib
diff --git a/docs/source/pokemonlib.GameClasses.rst b/docs/source/pokemonlib.GameClasses.rst
new file mode 100644
index 0000000..97d5857
--- /dev/null
+++ b/docs/source/pokemonlib.GameClasses.rst
@@ -0,0 +1,46 @@
+pokemonlib.GameClasses package
+==============================
+
+Submodules
+----------
+
+pokemonlib.GameClasses.CombatClass module
+-----------------------------------------
+
+.. automodule:: pokemonlib.GameClasses.CombatClass
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pokemonlib.GameClasses.PlayerClass module
+-----------------------------------------
+
+.. automodule:: pokemonlib.GameClasses.PlayerClass
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pokemonlib.GameClasses.PokemonClass module
+------------------------------------------
+
+.. automodule:: pokemonlib.GameClasses.PokemonClass
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pokemonlib.GameClasses.UIClass module
+-------------------------------------
+
+.. automodule:: pokemonlib.GameClasses.UIClass
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: pokemonlib.GameClasses
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/pokemonlib.misc.rst b/docs/source/pokemonlib.misc.rst
new file mode 100644
index 0000000..318aaa7
--- /dev/null
+++ b/docs/source/pokemonlib.misc.rst
@@ -0,0 +1,38 @@
+pokemonlib.misc package
+=======================
+
+Submodules
+----------
+
+pokemonlib.misc.Exeptions module
+--------------------------------
+
+.. automodule:: pokemonlib.misc.Exeptions
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pokemonlib.misc.Security module
+-------------------------------
+
+.. automodule:: pokemonlib.misc.Security
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pokemonlib.misc.Settings module
+-------------------------------
+
+.. automodule:: pokemonlib.misc.Settings
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: pokemonlib.misc
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/pokemonlib.pokemonDataDownload.rst b/docs/source/pokemonlib.pokemonDataDownload.rst
new file mode 100644
index 0000000..16f58be
--- /dev/null
+++ b/docs/source/pokemonlib.pokemonDataDownload.rst
@@ -0,0 +1,22 @@
+pokemonlib.pokemonDataDownload package
+======================================
+
+Submodules
+----------
+
+pokemonlib.pokemonDataDownload.GetPokeAPI module
+------------------------------------------------
+
+.. automodule:: pokemonlib.pokemonDataDownload.GetPokeAPI
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: pokemonlib.pokemonDataDownload
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/pokemonlib.rst b/docs/source/pokemonlib.rst
new file mode 100644
index 0000000..1ac704d
--- /dev/null
+++ b/docs/source/pokemonlib.rst
@@ -0,0 +1,20 @@
+pokemonlib package
+==================
+
+Subpackages
+-----------
+
+.. toctree::
+
+   pokemonlib.GameClasses
+   pokemonlib.misc
+   pokemonlib.pokemonDataDownload
+   pokemonlib.testFeatures
+
+Module contents
+---------------
+
+.. automodule:: pokemonlib
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/main.py b/main.py
deleted file mode 100644
index 6555327..0000000
--- a/main.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import logging
-import configparser
-
-from pokemonlib.pokemonDataDownload import GetPokeAPI as PkApi
-from pokemonlib.GameClasses import PokemonClass as Pkmn
-from pokemonlib.GameClasses import UIClass as UI
-
-
-log = logging.getLogger("Main")
-log.setLevel(logging.DEBUG)
-
-# Read the config.ini file to decide if pokemons should be updated
-config = configparser.ConfigParser()
-config.read('config.ini')
-
-if config.sections() == []:  # If config is Null Create it with default parameters
-
-    config["Config Version"] = {  # Used to check if this config is compatible with the current software version.
-        "version (DON'T MODIFY)": 1
-    }
-    config["Updater"] = {
-        "auto-update pokemons": True,
-        "auto-update attacks": False,
-    }
-    config["Modules To Start"] = {
-        "UI": True,
-        "Pokemon Class Test": True,
-    }
-    with open("config.ini", "w") as f:
-        config.write(f)
-    log.info("Created new config file")
-    input("Press Enter when you finished editing your config file.")
-
-
-try:
-
-    if config["Updater"]["auto-update pokemons"] == True:
-        PkApi.pokegetapi()
-
-    if config["Updater"]["auto-update attacks"] == True:
-        raise NotImplementedError("Attacks are not implemented for the moment")
-
-    if config["Modules To Start"]["UI"] == True:
-        log.debug("Starting graphic Test.")
-        UI.graphictest()
-
-    if config["Modules To Start"]["Pokemon Class Test"] == True:
-        Pkmn.testPokemonClass(log)
-
-except KeyError:  # If one of the keys aaren't found then Use default config
-    # Log the error as "Warning" for the user to use a correct config
-    log.error("Invalid config File. Using default configuration. To create a new config file, delete the old"+""
-              " config.ini")
diff --git a/pokemonlib.egg-info/PKG-INFO b/pokemonlib.egg-info/PKG-INFO
deleted file mode 100644
index 8967a7d..0000000
--- a/pokemonlib.egg-info/PKG-INFO
+++ /dev/null
@@ -1,94 +0,0 @@
-Metadata-Version: 1.1
-Name: pokemonlib
-Version: 0.0.2
-Summary: An implementation of pokemon algorithms
-Home-page: https://github.com/arthuro555/pokemonlib
-Author: arthuro555
-Author-email: papinrouge@gmail.com
-License: UNKNOWN
-Description: # Pokemonlib for python
-        [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/arthuro555)
-        [![Build Status](https://travis-ci.org/arthuro555/pokemonlib.svg?branch=master)](https://travis-ci.org/arthuro555/pokemonlib)
-        [![CircleCI](https://circleci.com/gh/arthuro555/pokemonlib/tree/master.svg?style=svg)](https://circleci.com/gh/arthuro555/pokemonlib/tree/master)
-        
-        ## WARNING:
-        **I Am not and don't claim to be affiliated with Pokemon or the Pokemon Company or Nintendo.
-        I do not own and don't claim to own Pokemon, the battle logic of the algorithm, the sprites,
-        the idea and the code of any official pokemon game. But I do own The code that is written by myself
-        and the way it was implemented.**
-        
-        This is a library containing a WIP (Work In Progress) implementation of the pokemon battle algorithm and
-        other features of the pokemon games.
-        
-        #### Present features:
-        
-        * Automatically get base pokemon data from the PokeApi
-        
-        #### WIP features
-        ###### I mean what I'm actively working on (Checked if ready for release soon and currently in test)
-        
-        - [ ] Pokemon Class
-        - [ ] Inventory/Player class
-        - [ ] Pokemon attacks
-        - [ ] Automatically get other pokemon data like sprites from the PokeApi
-        - [ ] Basic Battle UI (Very slow progress)
-        - [ ] Automatic game build
-        
-        #### Planned Features:
-        ###### (Checked means I'm starting to develop it as soon as I complete a WIP feature)
-        
-        + [X] Plugin System that permits to create your own pokemons/attacks/items
-        + [X] Items (Needs Inventory first)
-        - [ ] Battle Logic (A class that handles the whole battle but without any UI)
-        - [ ] Overworld UI
-        - [ ] Trainers battle
-        - [ ] Possibility to catch pokemons
-        - [ ] Interaction system in Overworld
-        
-        And possibly more ;-) you can always make a feature request in the issues tab.
-        
-        
-        ## Python Compatibility
-        
-        For now only python 3 is supported and python 2 support is not planned.
-        Anyways, if you're still using python 2, you should upgrade!
-        
-        ## Helping or contributing to the project
-        
-        I have no problem with people helping me. If someone makes many good pull request I will consider to add them
-        as contributors of this repo. If someone contributes to the project by more than a few lines of code or do
-        something really useful (like some english teacher who fixes all the typos) I will add them to a credit section
-        and a file credits.txt.
-        
-        **WARNING** I have some conditions for contributions.
-        
-        1. Explain thoroughly what you changed/implemented, how and if it's not on my feature board on that file also why.
-        2. Don't ask me questions on the code I don't have much free time and I prefer to use them to code myself.
-        3. I probably won't document very much changes I do to the code and don't complain.
-        4. Unless I make someone a contributor, This will stay **_my_** project and any code pushed by someone else will be
-        considered as 'Donated' and will become mine. You accept by pushing anything here to give up on any copyright
-        or rights that you own on the code you added/modified. I don't want my project to be steeled.
-        5. I'm (With contributors if I add some) the one(s) that decide if someone should be added/removed from the credits.
-        I am not obligated to let someone who contributed to the project on the list if I judge that wasn't enough because
-        else the list could become too long and I don't want people's name that made real and good contributions to be
-        hidden by hundreds of names of people that changed 2 characters.
-        6. I'm the only one to decide if someone should be a contributor or not.
-        7. DON'T COMPLAIN ON ANYTHING. IF YOU MAKE A CONTRIBUTION IT'S YOUR CHOICE AND AS THIS CONDITIONS WERE HERE
-        SINCE THE FIRST COMMIT SO YOU KNEW THE CONDITIONS
-        
-        ### What this project is meant to become
-        
-        This project is for now pieces of code on which you can use to make a simple pokemon game.
-        I want it to become a piece of software that you extend with your own script(s) and plugins.
-        A bit like renpy. If it goes on so far that all the 'Core' stuff is done and also the 'Graphical' part I would
-        want to make directly a 'Programming Language' for it (Just something to parse some pre defined syntax and connect it
-        with the 'Core' API) or a visual editor (Like idk Geometry dash). Keep the goal in mind if you make contributions
-        because if they are not compatible with my goals I will have to reject them.
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
diff --git a/pokemonlib.egg-info/SOURCES.txt b/pokemonlib.egg-info/SOURCES.txt
deleted file mode 100644
index e56fdde..0000000
--- a/pokemonlib.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-setup.py
-pokemonlib/__init__.py
-pokemonlib.egg-info/PKG-INFO
-pokemonlib.egg-info/SOURCES.txt
-pokemonlib.egg-info/dependency_links.txt
-pokemonlib.egg-info/requires.txt
-pokemonlib.egg-info/top_level.txt
-pokemonlib/GameClasses/CombatClass.py
-pokemonlib/GameClasses/PlayerClass.py
-pokemonlib/GameClasses/PokemonClass.py
-pokemonlib/GameClasses/UIClass.py
-pokemonlib/GameClasses/__init__.py
-pokemonlib/misc/Exeptions.py
-pokemonlib/misc/Security.py
-pokemonlib/misc/Settings.py
-pokemonlib/misc/__init__.py
-pokemonlib/pokemonDataDownload/GetPokeAPI.py
-pokemonlib/pokemonDataDownload/__init__.py
-pokemonlib/testFeatures/__init__.py
-pokemonlib/testFeatures/pandatassst.py
\ No newline at end of file
diff --git a/pokemonlib.egg-info/dependency_links.txt b/pokemonlib.egg-info/dependency_links.txt
deleted file mode 100644
index 8b13789..0000000
--- a/pokemonlib.egg-info/dependency_links.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-
diff --git a/pokemonlib.egg-info/requires.txt b/pokemonlib.egg-info/requires.txt
deleted file mode 100644
index d48958d..0000000
--- a/pokemonlib.egg-info/requires.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cryptography
-pyglet
-requests
diff --git a/pokemonlib.egg-info/top_level.txt b/pokemonlib.egg-info/top_level.txt
deleted file mode 100644
index d4da312..0000000
--- a/pokemonlib.egg-info/top_level.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-pokemonlib
diff --git a/pokemonlib/.pyarmor_config b/pokemonlib/.pyarmor_config
deleted file mode 100644
index c3e37c1..0000000
--- a/pokemonlib/.pyarmor_config
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "pokemonlib",
-  "title": "pokemonlib",
-  "src": "C:\\Users\\pc\\PycharmProjects\\poke et mon\\pokemonlib",
-  "is_package": 1,
-  "entry": "main.py",
-  "version": "1.2.0",
-  "manifest": "global-include *.py, global-include *.json, prune dist, prune test",
-  "output": "dist",
-  "capsule": "C:\\Users\\pc\\.pyarmor_capsule.zip",
-  "runtime_path": null,
-  "disable_restrict_mode": 0,
-  "obf_module_mode": "des",
-  "obf_code_mode": "des",
-  "obf_code": 1,
-  "obf_mod": 1,
-  "wrap_mode": 1,
-  "advanced_mode": 0,
-  "cross_protection": 1,
-  "plugins": null,
-  "platform": null,
-  "build_time": 0.0
-}
\ No newline at end of file
diff --git a/build/lib/pokemonlib/GameClasses/CombatClass.py b/pokemonlib/Core/Combat.py
similarity index 100%
rename from build/lib/pokemonlib/GameClasses/CombatClass.py
rename to pokemonlib/Core/Combat.py
diff --git a/build/lib/pokemonlib/GameClasses/PlayerClass.py b/pokemonlib/Core/Player.py
similarity index 97%
rename from build/lib/pokemonlib/GameClasses/PlayerClass.py
rename to pokemonlib/Core/Player.py
index ceec368..eebbcc9 100644
--- a/build/lib/pokemonlib/GameClasses/PlayerClass.py
+++ b/pokemonlib/Core/Player.py
@@ -2,7 +2,7 @@
 import json  # Needed to Dump and Parse save files
 import base64  # Additional layer of security for save files
 
-from .PokemonClass import Pokemon  # Check if objects passed to player are Pokemon and not a chair or something
+from .Pokemon import Pokemon  # Check if objects passed to player are Pokemon and not a chair or something
 
 from pokemonlib.misc import Settings  # Import the project settings
 from pokemonlib.misc import Security  # Encryption functions
diff --git a/build/lib/pokemonlib/GameClasses/PokemonClass.py b/pokemonlib/Core/Pokemon.py
similarity index 79%
rename from build/lib/pokemonlib/GameClasses/PokemonClass.py
rename to pokemonlib/Core/Pokemon.py
index 3185df1..fd6f9ac 100644
--- a/build/lib/pokemonlib/GameClasses/PokemonClass.py
+++ b/pokemonlib/Core/Pokemon.py
@@ -19,6 +19,8 @@ def __init__(self, pokemon_id=1):
         It also generates the base stats of a pokemon basing on it's id.
         Usage: p = Pokemon(pokemon_id)
         Result: 'Pokemon detected as ´" + self.name + "´ has finished initializing.'
+        Returns Nothing.
+        :param pokemon_id:
         """
 
         # Pokemon ID to recognize what pokemon it is even if self.name is changed (For Example Zoroarks
@@ -74,7 +76,7 @@ def __init__(self, pokemon_id=1):
 
         logPokemon.info("Pokemon detected as ´" + pokemon["name"] + "´ has finished initializing.")
 
-    def getstats(self):
+    def get_stats(self):
         """
         Gets all the stats of the pokemon and return them in form of a Dictionary.
         Usage: getstats()
@@ -166,6 +168,19 @@ def transfer(self, BoxInstance, pokemon_index):
         _ = self.pop(pokemon_index)
         return True
 
+    def pop(self, pokemon_index):
+        """
+        Replaces a pokemon object with none and returns the Pokemon object.
+        :param pokemon_index:
+        :return:
+        """
+        return_value = self.__pokemonlist.pop(pokemon_index)
+        if pokemon_index is 0:
+            self.__pokemonlist.append(None)
+        else:
+            self.__pokemonlist.insert(pokemon_index, None)
+        return return_value
+
     def get_pokemon(self, index):
         """
         Get a pokemon of this instance using it's index
@@ -181,7 +196,7 @@ def get_all_pokemons(self):
                 pokemon_list.append(pokemon)
 
 
-class Box(Team):
+class Box():
     def __init__(self, *args, **kwargs):
         templist = []
         self.__pokemonlist = []
@@ -254,8 +269,83 @@ def transfer(self, TeamInstance, pokemon_index):
         _ = self.pop(pokemon_index)
         return True
 
+    @property
+    def full(self):
+        for pokemon in self.__pokemonlist:
+            if pokemon is not None:
+                continue
+            return False
+        return True
+
+    def pop(self, pokemon_index):
+        """
+        Replaces a pokemon object with none and returns the Pokemon object.
+        :param pokemon_index:
+        :return:
+        """
+        return_value = self.__pokemonlist.pop(pokemon_index)
+        if pokemon_index is 0:
+            self.__pokemonlist.append(None)
+        else:
+            self.__pokemonlist.insert(pokemon_index, None)
+        return return_value
+
+    def insert(self, index, pokemon):
+        """
+        Add a pokemon to the team list. Returns True if setted successfully and False if something is already
+        in the index passed.
+        :param index:
+        :param pokemon:
+        :return:
+        """
+        if self.__pokemonlist[index] is not None:
+            return False
+        self.__pokemonlist[index] = pokemon
+        return True
+
+    def add(self, pokemon):
+        """
+        Adds a pokemon in the first Empty slot found. Returns False if None were found.
+        :param pokemon:
+        :return:
+        """
+        index = None
+        try:
+            index = self.__pokemonlist.index(None)
+        except ValueError:
+            return False
+        self.__pokemonlist[index] = pokemon
+        return True
+
+    def pop(self, pokemon_index):
+        """
+        Replaces a pokemon object with none and returns the Pokemon object.
+        :param pokemon_index:
+        :return:
+        """
+        return_value = self._Box__pokemonlist.pop(pokemon_index)
+        if pokemon_index is 0:
+            self._Box__pokemonlist.append(None)
+        else:
+            self.__pokemonlist.insert(pokemon_index, None)
+        return return_value
+
+    def get_pokemon(self, index):
+        """
+        Get a pokemon of this instance using it's index
+        :param index:
+        :return:
+        """
+        return self.__pokemonlist[index]
+
+    def get_all_pokemons(self):
+        pokemon_list = []
+        for pokemon in self.__pokemonlist:
+            if pokemon is not None:
+                pokemon_list.append(pokemon)
+
 
-def testPokemonClass(loggerInstance=logPokemon, pokemonId=None):
+def test_pokemon_class(loggerInstance=logPokemon, pokemonId=None):
     """
     A function that inits an object of the Pokemon Class to see if it works.
     :param pokemonId:
diff --git a/build/lib/pokemonlib/GameClasses/__init__.py b/pokemonlib/Core/SaveUtils.py
similarity index 100%
rename from build/lib/pokemonlib/GameClasses/__init__.py
rename to pokemonlib/Core/SaveUtils.py
diff --git a/build/lib/pokemonlib/__init__.py b/pokemonlib/Core/__init__.py
similarity index 100%
rename from build/lib/pokemonlib/__init__.py
rename to pokemonlib/Core/__init__.py
diff --git a/pokemonlib/Engine/UIClass.py b/pokemonlib/Engine/UIClass.py
new file mode 100644
index 0000000..e261ab5
--- /dev/null
+++ b/pokemonlib/Engine/UIClass.py
@@ -0,0 +1,1 @@
+#  Not implemented
diff --git a/build/lib/pokemonlib/misc/__init__.py b/pokemonlib/Engine/__init__.py
similarity index 100%
rename from build/lib/pokemonlib/misc/__init__.py
rename to pokemonlib/Engine/__init__.py
diff --git a/pokemonlib/GameClasses/CombatClass.py b/pokemonlib/GameClasses/CombatClass.py
deleted file mode 100644
index 82ec6f5..0000000
--- a/pokemonlib/GameClasses/CombatClass.py
+++ /dev/null
@@ -1,8 +0,0 @@
-class Combat:
-    def __init__(self, team_one, team_two):
-        self.team1 = team_one
-        self.team2 = team_two
-
-    def damage_calculation(self, pokemon_attacking, pokemon_defending):
-        pass
-
diff --git a/pokemonlib/GameClasses/PlayerClass.py b/pokemonlib/GameClasses/PlayerClass.py
deleted file mode 100644
index ceec368..0000000
--- a/pokemonlib/GameClasses/PlayerClass.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import logging  # Replacement for print() in cases it's not needed
-import json  # Needed to Dump and Parse save files
-import base64  # Additional layer of security for save files
-
-from .PokemonClass import Pokemon  # Check if objects passed to player are Pokemon and not a chair or something
-
-from pokemonlib.misc import Settings  # Import the project settings
-from pokemonlib.misc import Security  # Encryption functions
-from pokemonlib.misc import Exeptions  # Exceptions for when it goes wrong
-
-
-playerlog = logging.getLogger("Main.PlayerClass")
-
-
-class Player(object):
-    def __init__(self, new=False, save=None, starter=None, password=None):
-        if new:  # If there is no save to begin with
-            self.__pokemon = []  # create a list of pokemons
-
-            if starter is not None and isinstance(starter, Pokemon):  # If argument starter exists and is a Pokemon
-                self.__pokemon.append(starter)  # Add it to the list
-
-            self.__items = []  # Create the list of items
-
-            save_data = {"pokemons": self.__pokemon, "items": self.__items}  # create a dictionary with all the data
-
-            if Settings.POKEMON_LIKE_SAVES:  # If single save file
-                with open("save.pksv", "w") as f:  # Save the data
-                    if type(password) == str:  # If password valid
-                        playerlog.info("Detected valid password input: Encryption enabled for this save file.")
-                        save_data = base64.b85encode(Security.encrypt(json.dumps(save_data), password))
-                    elif Settings.ENABLE_AUTO_ENCRYPTION_FOR_SAVE_FILES:  # If Automatic encryption Enabled
-                        # encrypt the save_data before saving
-                        save_data = base64.b85encode(Security.encrypt_default_password(json.dumps(save_data)))
-                    else:
-                        json.dump(save_data, f)
-                    f.write(save_data)  # Write the data
-
-            else:  # If multiple saves
-                if type(save) == str:  # verify save file is a string
-                    with open(save + ".pksv", "w") as f:
-                        if type(password) == str:
-                            playerlog.info("Detected valid password input: Encryption enabled for this save file.")
-                            save_data = base64.b85encode(Security.encrypt(json.dumps(save_data), password))
-                        elif Settings.ENABLE_AUTO_ENCRYPTION_FOR_SAVE_FILES:  # If Automatic encryption Enabled
-                            # encrypt the save_data before saving
-                            save_data = base64.b85encode(Security.encrypt_default_password(json.dumps(save_data)))
-                        else:
-                            save_data = json.dump(save_data, f)
-                        f.write(save_data)
-
-                    playerlog.info("New player created and saved")
-                else:
-                    playerlog.warning("New player instance created but not saved as no correct save filename was given")
-                    playerlog.info("If you don't want to specify filename yourself, activate the Pokemon-like saves!")
-        else:
-            if Settings.POKEMON_LIKE_SAVES:  # If single save file
-                with open("save.pksv", "r") as f:  # Save the data
-                    if Settings.ENABLE_AUTO_ENCRYPTION_FOR_SAVE_FILES:  # If Automatic encryption Enabled
-                        # Load and decrypt dictionnary
-                        save_data = base64.b85decode(Security.decrypt_default_password(json.load(f)))
-                    else:
-                        save_data = json.load(f)
-
-            else:  # If multiple saves
-                if type(save) == str:  # verify save file is a string
-                    with open(save + ".pksv", "r") as f:
-                        save_data = json.load(f)
-                    playerlog.info("New player created and saved")
-                else:
-                    playerlog.warning("New player instance created but not saved as no correct save filename was given")
-                    playerlog.info("If you don't want to specify filename yourself, activate the Pokemon-like saves!")
-
-
-class Trainer(Player):
-    def __init__(self, pokemons):
-        pass
\ No newline at end of file
diff --git a/pokemonlib/GameClasses/PokemonClass.py b/pokemonlib/GameClasses/PokemonClass.py
deleted file mode 100644
index 3185df1..0000000
--- a/pokemonlib/GameClasses/PokemonClass.py
+++ /dev/null
@@ -1,294 +0,0 @@
-import os  # for finding the relative path to pokemon_data
-import json  # for parsing pokemon_data json files
-import random  # for generating IV or other random values
-import logging  # for printing data
-from pokemonlib.misc import Exeptions  # for initialisation exceptions
-
-logging.basicConfig()
-logging.root.setLevel(logging.NOTSET)
-logging.basicConfig(level=logging.NOTSET)
-logPokemon = logging.getLogger("Main.PokemonClass")
-logPokemon.setLevel(logging.DEBUG)
-
-
-class Pokemon(object):
-    # noinspection PyTypeChecker
-    def __init__(self, pokemon_id=1):
-        """
-        Pokemon is the base class of all pokemon objects. It stores the data and stats of the pokemons.
-        It also generates the base stats of a pokemon basing on it's id.
-        Usage: p = Pokemon(pokemon_id)
-        Result: 'Pokemon detected as ´" + self.name + "´ has finished initializing.'
-        """
-
-        # Pokemon ID to recognize what pokemon it is even if self.name is changed (For Example Zoroarks
-        # illusions or Dittos transformation)
-        self.__id = pokemon_id
-
-        pokemon = []
-        path = os.getcwd()  # Gets the relative path from main.py
-
-        # Decides if using \ for windows or / for mac and linux in the path
-        if os.name == "nt":
-            path += "\\pokemonlib\\pokemon_data\\pokemon_properties\\"
-        else:
-            path += "/pokemonlib/pokemon_data/pokemon_properties/"
-
-        # Search in pokemon_data for the data of the pokemon depending on the ID
-        for filename in os.listdir(path):
-            if filename != "pokemon_" + str(self.__id) + ".json":
-                continue
-            else:
-                f = open(path + filename, "r")
-                pokemon = json.load(f)
-                f.close()
-                break
-
-        # When There are no properties in the list raise an error
-        if pokemon == []:
-            raise Exeptions.IdNotReferenced("The pokemon_data with id " + str(self.__id) +
-                                            " was not found in the directory ´" + path +
-                                            "´. Make sure it is in a file named pokemon_(id of the pokemon_data).json")
-
-        # Sets all the base pokemon data to object variables. If any needed information is missing
-        # raise an error
-        try:
-            stats = pokemon["stats"]
-            self.name = pokemon["name"]
-            self._hp = stats["hp"]
-            self._defph = stats["defense"]
-            self._defsp = stats["special-defense"]
-            self._attkph = stats["attack"]
-            self._attksp = stats["special-defense"]
-            self._speed = stats["speed"]
-            self._lv = 1
-            self._types = pokemon["types"]
-            self._attacks = {1: ["Thunderbolt", 20, True], 2: ["Poop", 40, True], 3: ["Earthquake", 40, True],
-                             4: ["Scratch", 40, True]}
-            self._iv = random.randint(0, 31)
-
-        except KeyError:
-            raise Exeptions.InvalidPokemonData("Some needed data is missing in ´" + path + filename + "´. Please "
-                                               + "ensure that the name, base stats, attacks and the type are included."
-                                               + "")
-
-        logPokemon.info("Pokemon detected as ´" + pokemon["name"] + "´ has finished initializing.")
-
-    def getstats(self):
-        """
-        Gets all the stats of the pokemon and return them in form of a Dictionary.
-        Usage: getstats()
-        Returns: {'hp', 'def', 'defsp', 'attk', 'attksp', 'attacks'=[]}
-        """
-        return {"hp": self._hp, "def": self._defph, "defsp": self._defsp, "attk": self._attkph,
-                "attksp": self._attksp, "speed": self._speed, "attacks": self._attacks}
-
-
-class Team:
-    def __init__(self, pokemon1, pokemon2=None, pokemon3=None, pokemon4=None, pokemon5=None, pokemon6=None):
-        templist = [pokemon1, pokemon2, pokemon3, pokemon4, pokemon5, pokemon6]
-        self.__pokemonlist = []
-        for pokemon in templist:
-            if pokemon is not None:  # Check if this argument was passed
-                if isinstance(pokemon, Pokemon):  # Basic check
-                    self.__pokemonlist.append(pokemon)
-                else:
-                    raise Exeptions.NotAPokemon("Argument was passed that wasn't an instance of pokemon class")
-            else:
-                self.__pokemonlist.append(None)
-
-    def __str__(self):
-        return_message = "The team contains "
-        for pokemon in self.__pokemonlist:
-            return_message += pokemon.name + " and "
-        return return_message[:-5]
-
-    @property
-    def full(self):
-        for pokemon in self.__pokemonlist:
-            if pokemon is not None:
-                continue
-            return False
-        return True
-
-    def pop(self, pokemon_index):
-        """
-        Replaces a pokemon object with none and returns the Pokemon object.
-        :param pokemon_index:
-        :return:
-        """
-        return_value = self.__pokemonlist.pop(pokemon_index)
-        if pokemon_index is 0:
-            self.__pokemonlist.append(None)
-        else:
-            self.__pokemonlist.insert(pokemon_index, None)
-        return return_value
-
-    def insert(self, index, pokemon):
-        """
-        Add a pokemon to the team list. Returns True if setted successfully and False if something is already
-        in the index passed.
-        :param index:
-        :param pokemon:
-        :return:
-        """
-        if self.__pokemonlist[index] is not None:
-            return False
-        self.__pokemonlist[index] = pokemon
-        return True
-
-    def add(self, pokemon):
-        """
-        Adds a pokemon in the first Empty slot found. Returns False if None were found.
-        :param pokemon:
-        :return:
-        """
-        index = None
-        try:
-            index = self.__pokemonlist.index(None)
-        except ValueError:
-            return False
-        self.__pokemonlist[index] = pokemon
-        return True
-
-    def transfer(self, BoxInstance, pokemon_index):
-        """
-        Transfers a pokemon object from this Team instance to a box instance.
-        :param BoxInstance:
-        :param pokemon_index:
-        :return:
-        """
-        if not isinstance(BoxInstance, Box):
-            raise Exeptions.InvalidInput("The argument passed to this method should be an instance of the Box Class")
-        if BoxInstance.full is True:
-            raise Exeptions.ListFull("Can't add any more items to the Box: It's full.")
-        BoxInstance.add(self.__pokemonlist[pokemon_index])
-        _ = self.pop(pokemon_index)
-        return True
-
-    def get_pokemon(self, index):
-        """
-        Get a pokemon of this instance using it's index
-        :param index:
-        :return:
-        """
-        return self.__pokemonlist[index]
-
-    def get_all_pokemons(self):
-        pokemon_list = []
-        for pokemon in self.__pokemonlist:
-            if pokemon is not None:
-                pokemon_list.append(pokemon)
-
-
-class Box(Team):
-    def __init__(self, *args, **kwargs):
-        templist = []
-        self.__pokemonlist = []
-        if "MaxPokemon" in kwargs:
-            self.MaxPokemon = kwargs["MaxPokemon"]
-        else:
-            self.MaxPokemon = 50
-
-        for _ in range(self.MaxPokemon):
-            templist.append(None)
-
-        for pkmn in args:
-            length = 0
-            for p in templist:
-                if p is not None:
-                    length += 1
-            logPokemon.debug(str(length))
-            logPokemon.debug(templist)
-            logPokemon.debug(len(templist))
-            templist[length] = pkmn
-
-        for pos, pkmn in kwargs.items():
-            if pos == "MaxPokemon":
-                continue
-            try:
-                pos = [int(s) for s in pos.split() if s.isdigit()][0]
-                templist[pos] = pkmn
-            except IndexError:
-                logPokemon.info("An Unvalid keyword arg was given. Handling it as a normal arg.")
-                length = 0
-                for p in templist:
-                    if p is not None:
-                        length += 1
-                logPokemon.debug(str(length))
-                logPokemon.debug(templist)
-                logPokemon.debug(len(templist))
-                templist[length] = pkmn
-
-        if len(templist) - 1 > self.MaxPokemon:
-            raise ValueError("You entered contradictory values: More pokemons than the max capacity of the box")
-
-        for pokemon in templist:
-            if pokemon is not None:  # Check if this argument was passed
-                if isinstance(pokemon, Pokemon):  # Basic check
-                    self.__pokemonlist.append(pokemon)
-                else:
-                    raise Exeptions.NotAPokemon("Argument was passed that wasn't an instance of pokemon class")
-            else:
-                self.__pokemonlist.append(pokemon)
-
-    def __len__(self):
-        length = 0
-        for p in self.__pokemonlist:
-            if p is not None:
-                length += 1
-        return length
-
-    def transfer(self, TeamInstance, pokemon_index):
-        """
-        Transfers a pokemon object from this Box instance to a Team instance.
-        :param TeamInstance:
-        :param pokemon_index:
-        :return:
-        """
-        if not isinstance(TeamInstance, Team):
-            raise Exeptions.InvalidInput("The argument passed to this method should be an instance of the Team Class")
-        if TeamInstance.full is True:
-            raise Exeptions.ListFull("Can't add any more items to the Team: It's full.")
-        TeamInstance.add(self.__pokemonlist[pokemon_index])
-        _ = self.pop(pokemon_index)
-        return True
-
-
-def testPokemonClass(loggerInstance=logPokemon, pokemonId=None):
-    """
-    A function that inits an object of the Pokemon Class to see if it works.
-    :param pokemonId:
-    :param loggerInstance:
-    :return:
-    """
-    loggerInstance.info("Testing Pokemon Class:")
-    if pokemonId is None:
-        num = int(input("Give the id of a Pokemon to pass to the pokemon class"))  # Get id to pass to the __init__
-        # function from Pokemon Class
-    else:
-        num = pokemonId
-
-    if type(num) is int:
-        num_poke = 0
-        path = os.getcwd()  # Gets the relative path from main.py
-
-        # Decides if using \ for windows or / for mac and linux in the path
-        if os.name == "nt":
-            path += "pokemonlib\\pokemon_data\\pokemon_properties\\"
-        else:
-            path += "pokemonlib/pokemon_data/pokemon_properties/"
-
-        # Count the pokemon IDs
-        for _ in os.listdir(path):
-            num_poke += 1
-
-        if num not in range(0, num_poke):
-            raise Exeptions.IdNotReferenced("The id you entered is incorrect.")
-
-    else:
-        raise TypeError("Please enter an Integer.")
-
-    pkmn = Pokemon(num)
-    loggerInstance.info(pkmn.getstats())
-    return True
diff --git a/pokemonlib/GameClasses/UIClass.py b/pokemonlib/GameClasses/UIClass.py
deleted file mode 100644
index cf3c7ac..0000000
--- a/pokemonlib/GameClasses/UIClass.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from kivy.app import App
-from kivy.uix.widget import Widget
-from kivy.graphics import Rectangle
-
-
-class GameWidget(Widget):
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-        with self.canvas:
-            Rectangle(pos=(0,0), size=(100,100))
-
-
-class GameUI(App):
-    def build(self):
-        return GameWidget()
-
-
-app = GameUI()
-app.run()
-
-def graphictest():
-    a
\ No newline at end of file
diff --git a/pokemonlib/GameClasses/__init__.py b/pokemonlib/GameClasses/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/build/lib/pokemonlib/pokemonDataDownload/__init__.py b/pokemonlib/cli/__init__.py
similarity index 100%
rename from build/lib/pokemonlib/pokemonDataDownload/__init__.py
rename to pokemonlib/cli/__init__.py
diff --git a/pokemonlib/cli/pokeproject.py b/pokemonlib/cli/pokeproject.py
new file mode 100644
index 0000000..e261ab5
--- /dev/null
+++ b/pokemonlib/cli/pokeproject.py
@@ -0,0 +1,1 @@
+#  Not implemented
diff --git a/pokemonlib/config.ini b/pokemonlib/config.ini
deleted file mode 100644
index d44e65e..0000000
--- a/pokemonlib/config.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Config Version]
-version (don't modify) = 1
-
-[Updater]
-auto-update pokemons = False
-auto-update attacks = False
-
-[Modules To Start]
-ui = True
-pokemon class test = True
-
diff --git a/pokemonlib/misc/__pycache__/Exeptions.cpython-37.pyc b/pokemonlib/misc/__pycache__/Exeptions.cpython-37.pyc
new file mode 100644
index 0000000..7172857
Binary files /dev/null and b/pokemonlib/misc/__pycache__/Exeptions.cpython-37.pyc differ
diff --git a/pokemonlib/misc/__pycache__/Security.cpython-37.pyc b/pokemonlib/misc/__pycache__/Security.cpython-37.pyc
new file mode 100644
index 0000000..8fb18b3
Binary files /dev/null and b/pokemonlib/misc/__pycache__/Security.cpython-37.pyc differ
diff --git a/pokemonlib/misc/__pycache__/Settings.cpython-37.pyc b/pokemonlib/misc/__pycache__/Settings.cpython-37.pyc
new file mode 100644
index 0000000..bbee2bb
Binary files /dev/null and b/pokemonlib/misc/__pycache__/Settings.cpython-37.pyc differ
diff --git a/pokemonlib/misc/__pycache__/__init__.cpython-37.pyc b/pokemonlib/misc/__pycache__/__init__.cpython-37.pyc
new file mode 100644
index 0000000..d74de08
Binary files /dev/null and b/pokemonlib/misc/__pycache__/__init__.cpython-37.pyc differ
diff --git a/pokemonlib/pokemonDataDownload/GetPokeAPI.py b/pokemonlib/pokemonDataDownload/GetPokeAPI.py
index 0dbd067..32204a2 100644
--- a/pokemonlib/pokemonDataDownload/GetPokeAPI.py
+++ b/pokemonlib/pokemonDataDownload/GetPokeAPI.py
@@ -3,56 +3,36 @@
 import os
 
 
-def pokedatagetfromapi():
-
-    for idn in range(0, 807):  # For all existing pokemon
-        ff = False  # Reset this variable used to verify if first iteration of next for loop
-        types = []  # Reset type list
-        p_type = " "  # Reset the string that will be printed
-        stats = {}  # Reset dictionary responsible for pokemon statistics
-        # idn += 1   idk anymore why I added that
-
-        response = requests.get("https://pokeapi.co/api/v2/pokemon/"+str(idn)+"/")  # Get data in json from the api
-
-        for x in response.json()["types"]:  # For each type the pokemon has
-            if ff:  # if not first iteration
-                p_type += " and "  # add an "and" in the string that will be printed
-            ff = True  # Variable changed: Not first iteration
-            p_type += str(x["type"]["name"])  # add the type of th pokemon to what will be printed
+def download_pokemon_data():
+    print("Downloading pokemon data...")
+    path = os.getcwd()
+    pokemon_data_path = path + f"{os.path.sep}pokemonlib{os.path.sep}pokemon_data{os.path.sep}"
+    pokemon_properties_path = f"{pokemon_data_path}pokemon_properties{os.path.sep}"
+    print(pokemon_properties_path)
+
+    if not os.path.exists(pokemon_data_path):
+        os.mkdir(pokemon_data_path)
+    if not os.path.exists(pokemon_properties_path):
+        os.mkdir(pokemon_properties_path)
+
+    all_pokemons = requests\
+        .get("https://pokeapi.co/api/v2/pokemon/?limit=999999999")\
+        .json()["results"]  # Get list of all pokemons
+
+    for pokemon_endpoint in all_pokemons:
+        pokemon_data = requests.get(pokemon_endpoint["url"]).json()
+
+        types = []
+        for x in pokemon_data["types"]:  # For each type the pokemon has
             types.append(str(x["type"]["name"]))  # transfer the values to another list
-        name = response.json()["name"]  # Get the pokemon's name
 
-        # print out the data collected
-        print("Pokemon with id " + str(idn) + " is named " + name + ", and is a" + p_type + " type pokemon_data.")
-
-        for x in response.json()["stats"]:  # for each stat of the pokemon
+        stats = {}
+        for x in pokemon_data["stats"]:  # for each stat of the pokemon
             stats[x["stat"]["name"]] = x["base_stat"]  # add the base stat in a dictionary with stat name as key
 
-        # make a final dictionary containing all the needed data
-        pokedata = {"name": name, "types": types, "stats": stats}
-
-        path = os.getcwd()  # Gets the relative path from main.py
-
-        # Decides if using \ for windows or / for mac and linux in the path
-        if os.name == "nt":
-            otherpath = path + "pokemonlib\\pokemon_data\\"
-            path += "pokemonlib\\pokemon_data\\pokemon_properties\\"
-        else:
-            otherpath = path + "pokemonlib/pokemon_data/"
-            path += "pokemonlib/pokemon_data/pokemon_properties/"
-
-        try:
-            # Save the pokedata variable as json
-            with open(path + "/pokemon_" + str(idn) + ".json", "w+") as f:
-                json.dump(pokedata, f)
-
-            print("Saved " + str(idn))
-
-        except FileNotFoundError:  # If directory doesn't exist
-            os.mkdir(otherpath)  # create the pokemon_data directory
-            os.mkdir(path)  # create the pokemon_properties sub-directory
-
-            with open(path + "/pokemon_" + str(idn) + ".json", "w+") as f:  # Now try again to save
-                json.dump(pokedata, f)
+        simplified_pokemon_data = {"name": pokemon_data["name"], "types": types, "stats": stats}
 
-            print("Saved " + str(idn))
+        # Save it as json
+        with open(pokemon_properties_path + "/pokemon_" + str(pokemon_data["id"]) + ".json", "w") as f:
+            json.dump(simplified_pokemon_data, f)
+            print(f"Saved {pokemon_data['name']}")
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_1.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_1.json
index f8141f3..71cc48c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_1.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_1.json
@@ -1,1 +1,1 @@
-{"name": "bulbasaur", "types": ["poison", "grass"], "stats": {"speed": 45, "special-defense": 65, "special-attack": 65, "defense": 49, "attack": 49, "hp": 45}}
\ No newline at end of file
+{"name": "bulbasaur", "types": ["grass", "poison"], "stats": {"hp": 45, "attack": 49, "defense": 49, "special-attack": 65, "special-defense": 65, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10.json
index e6a9ef5..54b25d2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10.json
@@ -1,1 +1,1 @@
-{"name": "caterpie", "types": ["bug"], "stats": {"speed": 45, "special-defense": 20, "special-attack": 20, "defense": 35, "attack": 30, "hp": 45}}
\ No newline at end of file
+{"name": "caterpie", "types": ["bug"], "stats": {"hp": 45, "attack": 30, "defense": 35, "special-attack": 20, "special-defense": 20, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_100.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_100.json
index 8255efa..4712a23 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_100.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_100.json
@@ -1,1 +1,1 @@
-{"name": "voltorb", "types": ["electric"], "stats": {"speed": 100, "special-defense": 55, "special-attack": 55, "defense": 50, "attack": 30, "hp": 40}}
\ No newline at end of file
+{"name": "voltorb", "types": ["electric"], "stats": {"hp": 40, "attack": 30, "defense": 50, "special-attack": 55, "special-defense": 55, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10001.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10001.json
new file mode 100644
index 0000000..3a916a6
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10001.json
@@ -0,0 +1,1 @@
+{"name": "deoxys-attack", "types": ["psychic"], "stats": {"hp": 50, "attack": 180, "defense": 20, "special-attack": 180, "special-defense": 20, "speed": 150}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10002.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10002.json
new file mode 100644
index 0000000..d476f53
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10002.json
@@ -0,0 +1,1 @@
+{"name": "deoxys-defense", "types": ["psychic"], "stats": {"hp": 50, "attack": 70, "defense": 160, "special-attack": 70, "special-defense": 160, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10003.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10003.json
new file mode 100644
index 0000000..fa07b29
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10003.json
@@ -0,0 +1,1 @@
+{"name": "deoxys-speed", "types": ["psychic"], "stats": {"hp": 50, "attack": 95, "defense": 90, "special-attack": 95, "special-defense": 90, "speed": 180}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10004.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10004.json
new file mode 100644
index 0000000..a34ac32
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10004.json
@@ -0,0 +1,1 @@
+{"name": "wormadam-sandy", "types": ["bug", "ground"], "stats": {"hp": 60, "attack": 79, "defense": 105, "special-attack": 59, "special-defense": 85, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10005.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10005.json
new file mode 100644
index 0000000..3129cc8
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10005.json
@@ -0,0 +1,1 @@
+{"name": "wormadam-trash", "types": ["bug", "steel"], "stats": {"hp": 60, "attack": 69, "defense": 95, "special-attack": 69, "special-defense": 95, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10006.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10006.json
new file mode 100644
index 0000000..b42f0f1
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10006.json
@@ -0,0 +1,1 @@
+{"name": "shaymin-sky", "types": ["grass", "flying"], "stats": {"hp": 100, "attack": 103, "defense": 75, "special-attack": 120, "special-defense": 75, "speed": 127}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10007.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10007.json
new file mode 100644
index 0000000..5bca35d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10007.json
@@ -0,0 +1,1 @@
+{"name": "giratina-origin", "types": ["ghost", "dragon"], "stats": {"hp": 150, "attack": 120, "defense": 100, "special-attack": 120, "special-defense": 100, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10008.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10008.json
new file mode 100644
index 0000000..5af7039
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10008.json
@@ -0,0 +1,1 @@
+{"name": "rotom-heat", "types": ["electric", "fire"], "stats": {"hp": 50, "attack": 65, "defense": 107, "special-attack": 105, "special-defense": 107, "speed": 86}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10009.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10009.json
new file mode 100644
index 0000000..fa05f6b
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10009.json
@@ -0,0 +1,1 @@
+{"name": "rotom-wash", "types": ["electric", "water"], "stats": {"hp": 50, "attack": 65, "defense": 107, "special-attack": 105, "special-defense": 107, "speed": 86}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10010.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10010.json
new file mode 100644
index 0000000..8e4a6b8
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10010.json
@@ -0,0 +1,1 @@
+{"name": "rotom-frost", "types": ["electric", "ice"], "stats": {"hp": 50, "attack": 65, "defense": 107, "special-attack": 105, "special-defense": 107, "speed": 86}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10011.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10011.json
new file mode 100644
index 0000000..f37be11
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10011.json
@@ -0,0 +1,1 @@
+{"name": "rotom-fan", "types": ["electric", "flying"], "stats": {"hp": 50, "attack": 65, "defense": 107, "special-attack": 105, "special-defense": 107, "speed": 86}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10012.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10012.json
new file mode 100644
index 0000000..17dd621
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10012.json
@@ -0,0 +1,1 @@
+{"name": "rotom-mow", "types": ["electric", "grass"], "stats": {"hp": 50, "attack": 65, "defense": 107, "special-attack": 105, "special-defense": 107, "speed": 86}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10013.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10013.json
new file mode 100644
index 0000000..a1de448
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10013.json
@@ -0,0 +1,1 @@
+{"name": "castform-sunny", "types": ["fire"], "stats": {"hp": 70, "attack": 70, "defense": 70, "special-attack": 70, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10014.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10014.json
new file mode 100644
index 0000000..7bc2a3d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10014.json
@@ -0,0 +1,1 @@
+{"name": "castform-rainy", "types": ["water"], "stats": {"hp": 70, "attack": 70, "defense": 70, "special-attack": 70, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10015.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10015.json
new file mode 100644
index 0000000..28e0c3e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10015.json
@@ -0,0 +1,1 @@
+{"name": "castform-snowy", "types": ["ice"], "stats": {"hp": 70, "attack": 70, "defense": 70, "special-attack": 70, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10016.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10016.json
new file mode 100644
index 0000000..d733693
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10016.json
@@ -0,0 +1,1 @@
+{"name": "basculin-blue-striped", "types": ["water"], "stats": {"hp": 70, "attack": 92, "defense": 65, "special-attack": 80, "special-defense": 55, "speed": 98}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10017.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10017.json
new file mode 100644
index 0000000..a825fb3
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10017.json
@@ -0,0 +1,1 @@
+{"name": "darmanitan-zen", "types": ["fire", "psychic"], "stats": {"hp": 105, "attack": 30, "defense": 105, "special-attack": 140, "special-defense": 105, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10018.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10018.json
new file mode 100644
index 0000000..64aa9e4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10018.json
@@ -0,0 +1,1 @@
+{"name": "meloetta-pirouette", "types": ["normal", "fighting"], "stats": {"hp": 100, "attack": 128, "defense": 90, "special-attack": 77, "special-defense": 77, "speed": 128}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10019.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10019.json
new file mode 100644
index 0000000..134d4c5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10019.json
@@ -0,0 +1,1 @@
+{"name": "tornadus-therian", "types": ["flying"], "stats": {"hp": 79, "attack": 100, "defense": 80, "special-attack": 110, "special-defense": 90, "speed": 121}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10020.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10020.json
new file mode 100644
index 0000000..dab02af
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10020.json
@@ -0,0 +1,1 @@
+{"name": "thundurus-therian", "types": ["electric", "flying"], "stats": {"hp": 79, "attack": 105, "defense": 70, "special-attack": 145, "special-defense": 80, "speed": 101}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10021.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10021.json
new file mode 100644
index 0000000..3e4787f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10021.json
@@ -0,0 +1,1 @@
+{"name": "landorus-therian", "types": ["ground", "flying"], "stats": {"hp": 89, "attack": 145, "defense": 90, "special-attack": 105, "special-defense": 80, "speed": 91}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10022.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10022.json
new file mode 100644
index 0000000..389e065
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10022.json
@@ -0,0 +1,1 @@
+{"name": "kyurem-black", "types": ["dragon", "ice"], "stats": {"hp": 125, "attack": 170, "defense": 100, "special-attack": 120, "special-defense": 90, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10023.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10023.json
new file mode 100644
index 0000000..391549c
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10023.json
@@ -0,0 +1,1 @@
+{"name": "kyurem-white", "types": ["dragon", "ice"], "stats": {"hp": 125, "attack": 120, "defense": 90, "special-attack": 170, "special-defense": 100, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10024.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10024.json
new file mode 100644
index 0000000..a93419f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10024.json
@@ -0,0 +1,1 @@
+{"name": "keldeo-resolute", "types": ["water", "fighting"], "stats": {"hp": 91, "attack": 72, "defense": 90, "special-attack": 129, "special-defense": 90, "speed": 108}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10025.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10025.json
new file mode 100644
index 0000000..dd62ec5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10025.json
@@ -0,0 +1,1 @@
+{"name": "meowstic-female", "types": ["psychic"], "stats": {"hp": 74, "attack": 48, "defense": 76, "special-attack": 83, "special-defense": 81, "speed": 104}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10026.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10026.json
new file mode 100644
index 0000000..e12b638
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10026.json
@@ -0,0 +1,1 @@
+{"name": "aegislash-blade", "types": ["steel", "ghost"], "stats": {"hp": 60, "attack": 150, "defense": 50, "special-attack": 150, "special-defense": 50, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10027.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10027.json
new file mode 100644
index 0000000..738cce5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10027.json
@@ -0,0 +1,1 @@
+{"name": "pumpkaboo-small", "types": ["ghost", "grass"], "stats": {"hp": 44, "attack": 66, "defense": 70, "special-attack": 44, "special-defense": 55, "speed": 56}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10028.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10028.json
new file mode 100644
index 0000000..363a706
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10028.json
@@ -0,0 +1,1 @@
+{"name": "pumpkaboo-large", "types": ["ghost", "grass"], "stats": {"hp": 54, "attack": 66, "defense": 70, "special-attack": 44, "special-defense": 55, "speed": 46}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10029.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10029.json
new file mode 100644
index 0000000..805aaf3
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10029.json
@@ -0,0 +1,1 @@
+{"name": "pumpkaboo-super", "types": ["ghost", "grass"], "stats": {"hp": 59, "attack": 66, "defense": 70, "special-attack": 44, "special-defense": 55, "speed": 41}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10030.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10030.json
new file mode 100644
index 0000000..457a604
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10030.json
@@ -0,0 +1,1 @@
+{"name": "gourgeist-small", "types": ["ghost", "grass"], "stats": {"hp": 55, "attack": 85, "defense": 122, "special-attack": 58, "special-defense": 75, "speed": 99}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10031.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10031.json
new file mode 100644
index 0000000..b579345
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10031.json
@@ -0,0 +1,1 @@
+{"name": "gourgeist-large", "types": ["ghost", "grass"], "stats": {"hp": 75, "attack": 95, "defense": 122, "special-attack": 58, "special-defense": 75, "speed": 69}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10032.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10032.json
new file mode 100644
index 0000000..d55f95e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10032.json
@@ -0,0 +1,1 @@
+{"name": "gourgeist-super", "types": ["ghost", "grass"], "stats": {"hp": 85, "attack": 100, "defense": 122, "special-attack": 58, "special-defense": 75, "speed": 54}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10033.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10033.json
new file mode 100644
index 0000000..146b8a4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10033.json
@@ -0,0 +1,1 @@
+{"name": "venusaur-mega", "types": ["grass", "poison"], "stats": {"hp": 80, "attack": 100, "defense": 123, "special-attack": 122, "special-defense": 120, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10034.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10034.json
new file mode 100644
index 0000000..56594a5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10034.json
@@ -0,0 +1,1 @@
+{"name": "charizard-mega-x", "types": ["fire", "dragon"], "stats": {"hp": 78, "attack": 130, "defense": 111, "special-attack": 130, "special-defense": 85, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10035.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10035.json
new file mode 100644
index 0000000..fe758b8
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10035.json
@@ -0,0 +1,1 @@
+{"name": "charizard-mega-y", "types": ["fire", "flying"], "stats": {"hp": 78, "attack": 104, "defense": 78, "special-attack": 159, "special-defense": 115, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10036.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10036.json
new file mode 100644
index 0000000..1d1922c
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10036.json
@@ -0,0 +1,1 @@
+{"name": "blastoise-mega", "types": ["water"], "stats": {"hp": 79, "attack": 103, "defense": 120, "special-attack": 135, "special-defense": 115, "speed": 78}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10037.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10037.json
new file mode 100644
index 0000000..faf2caf
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10037.json
@@ -0,0 +1,1 @@
+{"name": "alakazam-mega", "types": ["psychic"], "stats": {"hp": 55, "attack": 50, "defense": 65, "special-attack": 175, "special-defense": 105, "speed": 150}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10038.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10038.json
new file mode 100644
index 0000000..e9c9e1b
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10038.json
@@ -0,0 +1,1 @@
+{"name": "gengar-mega", "types": ["ghost", "poison"], "stats": {"hp": 60, "attack": 65, "defense": 80, "special-attack": 170, "special-defense": 95, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10039.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10039.json
new file mode 100644
index 0000000..7f4856a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10039.json
@@ -0,0 +1,1 @@
+{"name": "kangaskhan-mega", "types": ["normal"], "stats": {"hp": 105, "attack": 125, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10040.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10040.json
new file mode 100644
index 0000000..48a04f7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10040.json
@@ -0,0 +1,1 @@
+{"name": "pinsir-mega", "types": ["bug", "flying"], "stats": {"hp": 65, "attack": 155, "defense": 120, "special-attack": 65, "special-defense": 90, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10041.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10041.json
new file mode 100644
index 0000000..c174a41
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10041.json
@@ -0,0 +1,1 @@
+{"name": "gyarados-mega", "types": ["water", "dark"], "stats": {"hp": 95, "attack": 155, "defense": 109, "special-attack": 70, "special-defense": 130, "speed": 81}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10042.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10042.json
new file mode 100644
index 0000000..38f0343
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10042.json
@@ -0,0 +1,1 @@
+{"name": "aerodactyl-mega", "types": ["rock", "flying"], "stats": {"hp": 80, "attack": 135, "defense": 85, "special-attack": 70, "special-defense": 95, "speed": 150}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10043.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10043.json
new file mode 100644
index 0000000..cf203db
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10043.json
@@ -0,0 +1,1 @@
+{"name": "mewtwo-mega-x", "types": ["psychic", "fighting"], "stats": {"hp": 106, "attack": 190, "defense": 100, "special-attack": 154, "special-defense": 100, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10044.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10044.json
new file mode 100644
index 0000000..b3b4ec3
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10044.json
@@ -0,0 +1,1 @@
+{"name": "mewtwo-mega-y", "types": ["psychic"], "stats": {"hp": 106, "attack": 150, "defense": 70, "special-attack": 194, "special-defense": 120, "speed": 140}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10045.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10045.json
new file mode 100644
index 0000000..a14dae5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10045.json
@@ -0,0 +1,1 @@
+{"name": "ampharos-mega", "types": ["electric", "dragon"], "stats": {"hp": 90, "attack": 95, "defense": 105, "special-attack": 165, "special-defense": 110, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10046.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10046.json
new file mode 100644
index 0000000..68853ac
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10046.json
@@ -0,0 +1,1 @@
+{"name": "scizor-mega", "types": ["bug", "steel"], "stats": {"hp": 70, "attack": 150, "defense": 140, "special-attack": 65, "special-defense": 100, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10047.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10047.json
new file mode 100644
index 0000000..59dc8f1
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10047.json
@@ -0,0 +1,1 @@
+{"name": "heracross-mega", "types": ["bug", "fighting"], "stats": {"hp": 80, "attack": 185, "defense": 115, "special-attack": 40, "special-defense": 105, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10048.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10048.json
new file mode 100644
index 0000000..28f6f9a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10048.json
@@ -0,0 +1,1 @@
+{"name": "houndoom-mega", "types": ["dark", "fire"], "stats": {"hp": 75, "attack": 90, "defense": 90, "special-attack": 140, "special-defense": 90, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10049.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10049.json
new file mode 100644
index 0000000..9038241
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10049.json
@@ -0,0 +1,1 @@
+{"name": "tyranitar-mega", "types": ["rock", "dark"], "stats": {"hp": 100, "attack": 164, "defense": 150, "special-attack": 95, "special-defense": 120, "speed": 71}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10050.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10050.json
new file mode 100644
index 0000000..2991d77
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10050.json
@@ -0,0 +1,1 @@
+{"name": "blaziken-mega", "types": ["fire", "fighting"], "stats": {"hp": 80, "attack": 160, "defense": 80, "special-attack": 130, "special-defense": 80, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10051.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10051.json
new file mode 100644
index 0000000..7b409f7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10051.json
@@ -0,0 +1,1 @@
+{"name": "gardevoir-mega", "types": ["psychic", "fairy"], "stats": {"hp": 68, "attack": 85, "defense": 65, "special-attack": 165, "special-defense": 135, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10052.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10052.json
new file mode 100644
index 0000000..48f8531
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10052.json
@@ -0,0 +1,1 @@
+{"name": "mawile-mega", "types": ["steel", "fairy"], "stats": {"hp": 50, "attack": 105, "defense": 125, "special-attack": 55, "special-defense": 95, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10053.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10053.json
new file mode 100644
index 0000000..b7f636a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10053.json
@@ -0,0 +1,1 @@
+{"name": "aggron-mega", "types": ["steel"], "stats": {"hp": 70, "attack": 140, "defense": 230, "special-attack": 60, "special-defense": 80, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10054.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10054.json
new file mode 100644
index 0000000..62b97b6
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10054.json
@@ -0,0 +1,1 @@
+{"name": "medicham-mega", "types": ["fighting", "psychic"], "stats": {"hp": 60, "attack": 100, "defense": 85, "special-attack": 80, "special-defense": 85, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10055.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10055.json
new file mode 100644
index 0000000..753d42f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10055.json
@@ -0,0 +1,1 @@
+{"name": "manectric-mega", "types": ["electric"], "stats": {"hp": 70, "attack": 75, "defense": 80, "special-attack": 135, "special-defense": 80, "speed": 135}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10056.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10056.json
new file mode 100644
index 0000000..dbddc78
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10056.json
@@ -0,0 +1,1 @@
+{"name": "banette-mega", "types": ["ghost"], "stats": {"hp": 64, "attack": 165, "defense": 75, "special-attack": 93, "special-defense": 83, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10057.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10057.json
new file mode 100644
index 0000000..c513327
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10057.json
@@ -0,0 +1,1 @@
+{"name": "absol-mega", "types": ["dark"], "stats": {"hp": 65, "attack": 150, "defense": 60, "special-attack": 115, "special-defense": 60, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10058.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10058.json
new file mode 100644
index 0000000..c9b975d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10058.json
@@ -0,0 +1,1 @@
+{"name": "garchomp-mega", "types": ["dragon", "ground"], "stats": {"hp": 108, "attack": 170, "defense": 115, "special-attack": 120, "special-defense": 95, "speed": 92}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10059.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10059.json
new file mode 100644
index 0000000..c198fb7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10059.json
@@ -0,0 +1,1 @@
+{"name": "lucario-mega", "types": ["fighting", "steel"], "stats": {"hp": 70, "attack": 145, "defense": 88, "special-attack": 140, "special-defense": 70, "speed": 112}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10060.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10060.json
new file mode 100644
index 0000000..bd8aef5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10060.json
@@ -0,0 +1,1 @@
+{"name": "abomasnow-mega", "types": ["grass", "ice"], "stats": {"hp": 90, "attack": 132, "defense": 105, "special-attack": 132, "special-defense": 105, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10061.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10061.json
new file mode 100644
index 0000000..786d12d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10061.json
@@ -0,0 +1,1 @@
+{"name": "floette-eternal", "types": ["fairy"], "stats": {"hp": 74, "attack": 65, "defense": 67, "special-attack": 125, "special-defense": 128, "speed": 92}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10062.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10062.json
new file mode 100644
index 0000000..c3aeab1
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10062.json
@@ -0,0 +1,1 @@
+{"name": "latias-mega", "types": ["dragon", "psychic"], "stats": {"hp": 80, "attack": 100, "defense": 120, "special-attack": 140, "special-defense": 150, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10063.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10063.json
new file mode 100644
index 0000000..8190c95
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10063.json
@@ -0,0 +1,1 @@
+{"name": "latios-mega", "types": ["dragon", "psychic"], "stats": {"hp": 80, "attack": 130, "defense": 100, "special-attack": 160, "special-defense": 120, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10064.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10064.json
new file mode 100644
index 0000000..3d1f080
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10064.json
@@ -0,0 +1,1 @@
+{"name": "swampert-mega", "types": ["water", "ground"], "stats": {"hp": 100, "attack": 150, "defense": 110, "special-attack": 95, "special-defense": 110, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10065.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10065.json
new file mode 100644
index 0000000..1587a32
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10065.json
@@ -0,0 +1,1 @@
+{"name": "sceptile-mega", "types": ["grass", "dragon"], "stats": {"hp": 70, "attack": 110, "defense": 75, "special-attack": 145, "special-defense": 85, "speed": 145}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10066.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10066.json
new file mode 100644
index 0000000..3339fe0
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10066.json
@@ -0,0 +1,1 @@
+{"name": "sableye-mega", "types": ["dark", "ghost"], "stats": {"hp": 50, "attack": 85, "defense": 125, "special-attack": 85, "special-defense": 115, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10067.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10067.json
new file mode 100644
index 0000000..bb09b96
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10067.json
@@ -0,0 +1,1 @@
+{"name": "altaria-mega", "types": ["dragon", "fairy"], "stats": {"hp": 75, "attack": 110, "defense": 110, "special-attack": 110, "special-defense": 105, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10068.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10068.json
new file mode 100644
index 0000000..15e8f8e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10068.json
@@ -0,0 +1,1 @@
+{"name": "gallade-mega", "types": ["psychic", "fighting"], "stats": {"hp": 68, "attack": 165, "defense": 95, "special-attack": 65, "special-defense": 115, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10069.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10069.json
new file mode 100644
index 0000000..406110d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10069.json
@@ -0,0 +1,1 @@
+{"name": "audino-mega", "types": ["normal", "fairy"], "stats": {"hp": 103, "attack": 60, "defense": 126, "special-attack": 80, "special-defense": 126, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10070.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10070.json
new file mode 100644
index 0000000..51adff9
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10070.json
@@ -0,0 +1,1 @@
+{"name": "sharpedo-mega", "types": ["water", "dark"], "stats": {"hp": 70, "attack": 140, "defense": 70, "special-attack": 110, "special-defense": 65, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10071.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10071.json
new file mode 100644
index 0000000..479c435
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10071.json
@@ -0,0 +1,1 @@
+{"name": "slowbro-mega", "types": ["water", "psychic"], "stats": {"hp": 95, "attack": 75, "defense": 180, "special-attack": 130, "special-defense": 80, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10072.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10072.json
new file mode 100644
index 0000000..3718577
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10072.json
@@ -0,0 +1,1 @@
+{"name": "steelix-mega", "types": ["steel", "ground"], "stats": {"hp": 75, "attack": 125, "defense": 230, "special-attack": 55, "special-defense": 95, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10073.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10073.json
new file mode 100644
index 0000000..a18ff43
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10073.json
@@ -0,0 +1,1 @@
+{"name": "pidgeot-mega", "types": ["normal", "flying"], "stats": {"hp": 83, "attack": 80, "defense": 80, "special-attack": 135, "special-defense": 80, "speed": 121}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10074.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10074.json
new file mode 100644
index 0000000..61494a6
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10074.json
@@ -0,0 +1,1 @@
+{"name": "glalie-mega", "types": ["ice"], "stats": {"hp": 80, "attack": 120, "defense": 80, "special-attack": 120, "special-defense": 80, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10075.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10075.json
new file mode 100644
index 0000000..1f058b7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10075.json
@@ -0,0 +1,1 @@
+{"name": "diancie-mega", "types": ["rock", "fairy"], "stats": {"hp": 50, "attack": 160, "defense": 110, "special-attack": 160, "special-defense": 110, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10076.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10076.json
new file mode 100644
index 0000000..8024568
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10076.json
@@ -0,0 +1,1 @@
+{"name": "metagross-mega", "types": ["steel", "psychic"], "stats": {"hp": 80, "attack": 145, "defense": 150, "special-attack": 105, "special-defense": 110, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10077.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10077.json
new file mode 100644
index 0000000..7897d30
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10077.json
@@ -0,0 +1,1 @@
+{"name": "kyogre-primal", "types": ["water"], "stats": {"hp": 100, "attack": 150, "defense": 90, "special-attack": 180, "special-defense": 160, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10078.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10078.json
new file mode 100644
index 0000000..e46a53d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10078.json
@@ -0,0 +1,1 @@
+{"name": "groudon-primal", "types": ["ground", "fire"], "stats": {"hp": 100, "attack": 180, "defense": 160, "special-attack": 150, "special-defense": 90, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10079.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10079.json
new file mode 100644
index 0000000..289f960
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10079.json
@@ -0,0 +1,1 @@
+{"name": "rayquaza-mega", "types": ["dragon", "flying"], "stats": {"hp": 105, "attack": 180, "defense": 100, "special-attack": 180, "special-defense": 100, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10080.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10080.json
new file mode 100644
index 0000000..ea84790
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10080.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-rock-star", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10081.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10081.json
new file mode 100644
index 0000000..0d9ceb4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10081.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-belle", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10082.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10082.json
new file mode 100644
index 0000000..eb9e7ee
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10082.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-pop-star", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10083.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10083.json
new file mode 100644
index 0000000..201d1e5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10083.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-phd", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10084.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10084.json
new file mode 100644
index 0000000..e1fdc35
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10084.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-libre", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10085.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10085.json
new file mode 100644
index 0000000..78fa3ea
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10085.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-cosplay", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10086.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10086.json
new file mode 100644
index 0000000..3bd74b0
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10086.json
@@ -0,0 +1,1 @@
+{"name": "hoopa-unbound", "types": ["psychic", "dark"], "stats": {"hp": 80, "attack": 160, "defense": 60, "special-attack": 170, "special-defense": 130, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10087.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10087.json
new file mode 100644
index 0000000..d9fb01a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10087.json
@@ -0,0 +1,1 @@
+{"name": "camerupt-mega", "types": ["fire", "ground"], "stats": {"hp": 70, "attack": 120, "defense": 100, "special-attack": 145, "special-defense": 105, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10088.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10088.json
new file mode 100644
index 0000000..7757dc7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10088.json
@@ -0,0 +1,1 @@
+{"name": "lopunny-mega", "types": ["normal", "fighting"], "stats": {"hp": 65, "attack": 136, "defense": 94, "special-attack": 54, "special-defense": 96, "speed": 135}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10089.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10089.json
new file mode 100644
index 0000000..a22cc90
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10089.json
@@ -0,0 +1,1 @@
+{"name": "salamence-mega", "types": ["dragon", "flying"], "stats": {"hp": 95, "attack": 145, "defense": 130, "special-attack": 120, "special-defense": 90, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10090.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10090.json
new file mode 100644
index 0000000..f5f402e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10090.json
@@ -0,0 +1,1 @@
+{"name": "beedrill-mega", "types": ["bug", "poison"], "stats": {"hp": 65, "attack": 150, "defense": 40, "special-attack": 15, "special-defense": 80, "speed": 145}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10091.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10091.json
new file mode 100644
index 0000000..9edbd70
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10091.json
@@ -0,0 +1,1 @@
+{"name": "rattata-alola", "types": ["dark", "normal"], "stats": {"hp": 30, "attack": 56, "defense": 35, "special-attack": 25, "special-defense": 35, "speed": 72}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10092.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10092.json
new file mode 100644
index 0000000..4765d74
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10092.json
@@ -0,0 +1,1 @@
+{"name": "raticate-alola", "types": ["dark", "normal"], "stats": {"hp": 75, "attack": 71, "defense": 70, "special-attack": 40, "special-defense": 80, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10093.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10093.json
new file mode 100644
index 0000000..9806c15
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10093.json
@@ -0,0 +1,1 @@
+{"name": "raticate-totem-alola", "types": ["dark", "normal"], "stats": {"hp": 75, "attack": 71, "defense": 70, "special-attack": 40, "special-defense": 80, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10094.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10094.json
new file mode 100644
index 0000000..3f707b4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10094.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-original-cap", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10095.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10095.json
new file mode 100644
index 0000000..5ebe6c4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10095.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-hoenn-cap", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10096.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10096.json
new file mode 100644
index 0000000..7e6ae2c
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10096.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-sinnoh-cap", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10097.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10097.json
new file mode 100644
index 0000000..783d7bd
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10097.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-unova-cap", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10098.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10098.json
new file mode 100644
index 0000000..fbcf473
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10098.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-kalos-cap", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10099.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10099.json
new file mode 100644
index 0000000..e30c476
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10099.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-alola-cap", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_101.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_101.json
index d5a28e6..443beab 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_101.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_101.json
@@ -1,1 +1,1 @@
-{"name": "electrode", "types": ["electric"], "stats": {"speed": 150, "special-defense": 80, "special-attack": 80, "defense": 70, "attack": 50, "hp": 60}}
\ No newline at end of file
+{"name": "electrode", "types": ["electric"], "stats": {"hp": 60, "attack": 50, "defense": 70, "special-attack": 80, "special-defense": 80, "speed": 150}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10100.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10100.json
new file mode 100644
index 0000000..c3745d8
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10100.json
@@ -0,0 +1,1 @@
+{"name": "raichu-alola", "types": ["electric", "psychic"], "stats": {"hp": 60, "attack": 85, "defense": 50, "special-attack": 95, "special-defense": 85, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10101.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10101.json
new file mode 100644
index 0000000..7ecc4a9
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10101.json
@@ -0,0 +1,1 @@
+{"name": "sandshrew-alola", "types": ["ice", "steel"], "stats": {"hp": 50, "attack": 75, "defense": 90, "special-attack": 10, "special-defense": 35, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10102.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10102.json
new file mode 100644
index 0000000..dc9168e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10102.json
@@ -0,0 +1,1 @@
+{"name": "sandslash-alola", "types": ["ice", "steel"], "stats": {"hp": 75, "attack": 100, "defense": 120, "special-attack": 25, "special-defense": 65, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10103.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10103.json
new file mode 100644
index 0000000..9e65736
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10103.json
@@ -0,0 +1,1 @@
+{"name": "vulpix-alola", "types": ["ice"], "stats": {"hp": 38, "attack": 41, "defense": 40, "special-attack": 50, "special-defense": 65, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10104.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10104.json
new file mode 100644
index 0000000..dbd6c7f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10104.json
@@ -0,0 +1,1 @@
+{"name": "ninetales-alola", "types": ["ice", "fairy"], "stats": {"hp": 73, "attack": 67, "defense": 75, "special-attack": 81, "special-defense": 100, "speed": 109}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10105.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10105.json
new file mode 100644
index 0000000..bffaf32
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10105.json
@@ -0,0 +1,1 @@
+{"name": "diglett-alola", "types": ["ground", "steel"], "stats": {"hp": 10, "attack": 55, "defense": 30, "special-attack": 35, "special-defense": 45, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10106.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10106.json
new file mode 100644
index 0000000..0720878
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10106.json
@@ -0,0 +1,1 @@
+{"name": "dugtrio-alola", "types": ["ground", "steel"], "stats": {"hp": 35, "attack": 100, "defense": 60, "special-attack": 50, "special-defense": 70, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10107.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10107.json
new file mode 100644
index 0000000..7e02553
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10107.json
@@ -0,0 +1,1 @@
+{"name": "meowth-alola", "types": ["dark"], "stats": {"hp": 40, "attack": 35, "defense": 35, "special-attack": 50, "special-defense": 40, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10108.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10108.json
new file mode 100644
index 0000000..c937903
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10108.json
@@ -0,0 +1,1 @@
+{"name": "persian-alola", "types": ["dark"], "stats": {"hp": 65, "attack": 60, "defense": 60, "special-attack": 75, "special-defense": 65, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10109.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10109.json
new file mode 100644
index 0000000..83ad872
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10109.json
@@ -0,0 +1,1 @@
+{"name": "geodude-alola", "types": ["rock", "electric"], "stats": {"hp": 40, "attack": 80, "defense": 100, "special-attack": 30, "special-defense": 30, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10110.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10110.json
new file mode 100644
index 0000000..6b94aa4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10110.json
@@ -0,0 +1,1 @@
+{"name": "graveler-alola", "types": ["rock", "electric"], "stats": {"hp": 55, "attack": 95, "defense": 115, "special-attack": 45, "special-defense": 45, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10111.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10111.json
new file mode 100644
index 0000000..e973787
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10111.json
@@ -0,0 +1,1 @@
+{"name": "golem-alola", "types": ["rock", "electric"], "stats": {"hp": 80, "attack": 120, "defense": 130, "special-attack": 55, "special-defense": 65, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10112.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10112.json
new file mode 100644
index 0000000..3703f6b
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10112.json
@@ -0,0 +1,1 @@
+{"name": "grimer-alola", "types": ["poison", "dark"], "stats": {"hp": 80, "attack": 80, "defense": 50, "special-attack": 40, "special-defense": 50, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10113.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10113.json
new file mode 100644
index 0000000..a3f4e6d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10113.json
@@ -0,0 +1,1 @@
+{"name": "muk-alola", "types": ["poison", "dark"], "stats": {"hp": 105, "attack": 105, "defense": 75, "special-attack": 65, "special-defense": 100, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10114.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10114.json
new file mode 100644
index 0000000..30595f0
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10114.json
@@ -0,0 +1,1 @@
+{"name": "exeggutor-alola", "types": ["grass", "dragon"], "stats": {"hp": 95, "attack": 105, "defense": 85, "special-attack": 125, "special-defense": 75, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10115.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10115.json
new file mode 100644
index 0000000..c57fb52
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10115.json
@@ -0,0 +1,1 @@
+{"name": "marowak-alola", "types": ["fire", "ghost"], "stats": {"hp": 60, "attack": 80, "defense": 110, "special-attack": 50, "special-defense": 80, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10116.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10116.json
new file mode 100644
index 0000000..1cc67c4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10116.json
@@ -0,0 +1,1 @@
+{"name": "greninja-battle-bond", "types": ["water", "dark"], "stats": {"hp": 72, "attack": 95, "defense": 67, "special-attack": 103, "special-defense": 71, "speed": 122}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10117.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10117.json
new file mode 100644
index 0000000..bf77d0e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10117.json
@@ -0,0 +1,1 @@
+{"name": "greninja-ash", "types": ["water", "dark"], "stats": {"hp": 72, "attack": 145, "defense": 67, "special-attack": 153, "special-defense": 71, "speed": 132}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10118.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10118.json
new file mode 100644
index 0000000..0dc7fec
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10118.json
@@ -0,0 +1,1 @@
+{"name": "zygarde-10", "types": ["dragon", "ground"], "stats": {"hp": 54, "attack": 100, "defense": 71, "special-attack": 61, "special-defense": 85, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10119.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10119.json
new file mode 100644
index 0000000..684a1fe
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10119.json
@@ -0,0 +1,1 @@
+{"name": "zygarde-50", "types": ["dragon", "ground"], "stats": {"hp": 108, "attack": 100, "defense": 121, "special-attack": 81, "special-defense": 95, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10120.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10120.json
new file mode 100644
index 0000000..575fb5d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10120.json
@@ -0,0 +1,1 @@
+{"name": "zygarde-complete", "types": ["dragon", "ground"], "stats": {"hp": 216, "attack": 100, "defense": 121, "special-attack": 91, "special-defense": 95, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10121.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10121.json
new file mode 100644
index 0000000..32f8a59
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10121.json
@@ -0,0 +1,1 @@
+{"name": "gumshoos-totem", "types": ["normal"], "stats": {"hp": 88, "attack": 110, "defense": 60, "special-attack": 55, "special-defense": 60, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10122.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10122.json
new file mode 100644
index 0000000..8bbd90b
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10122.json
@@ -0,0 +1,1 @@
+{"name": "vikavolt-totem", "types": ["bug", "electric"], "stats": {"hp": 77, "attack": 70, "defense": 90, "special-attack": 145, "special-defense": 75, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10123.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10123.json
new file mode 100644
index 0000000..9b5ec78
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10123.json
@@ -0,0 +1,1 @@
+{"name": "oricorio-pom-pom", "types": ["electric", "flying"], "stats": {"hp": 75, "attack": 70, "defense": 70, "special-attack": 98, "special-defense": 70, "speed": 93}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10124.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10124.json
new file mode 100644
index 0000000..f90a6ff
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10124.json
@@ -0,0 +1,1 @@
+{"name": "oricorio-pau", "types": ["psychic", "flying"], "stats": {"hp": 75, "attack": 70, "defense": 70, "special-attack": 98, "special-defense": 70, "speed": 93}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10125.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10125.json
new file mode 100644
index 0000000..ee10048
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10125.json
@@ -0,0 +1,1 @@
+{"name": "oricorio-sensu", "types": ["ghost", "flying"], "stats": {"hp": 75, "attack": 70, "defense": 70, "special-attack": 98, "special-defense": 70, "speed": 93}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10126.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10126.json
new file mode 100644
index 0000000..d65b4e9
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10126.json
@@ -0,0 +1,1 @@
+{"name": "lycanroc-midnight", "types": ["rock"], "stats": {"hp": 85, "attack": 115, "defense": 75, "special-attack": 55, "special-defense": 75, "speed": 82}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10127.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10127.json
new file mode 100644
index 0000000..f6898e4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10127.json
@@ -0,0 +1,1 @@
+{"name": "wishiwashi-school", "types": ["water"], "stats": {"hp": 45, "attack": 140, "defense": 130, "special-attack": 140, "special-defense": 135, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10128.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10128.json
new file mode 100644
index 0000000..626d482
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10128.json
@@ -0,0 +1,1 @@
+{"name": "lurantis-totem", "types": ["grass"], "stats": {"hp": 70, "attack": 105, "defense": 90, "special-attack": 80, "special-defense": 90, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10129.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10129.json
new file mode 100644
index 0000000..50aaef8
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10129.json
@@ -0,0 +1,1 @@
+{"name": "salazzle-totem", "types": ["poison", "fire"], "stats": {"hp": 68, "attack": 64, "defense": 60, "special-attack": 111, "special-defense": 60, "speed": 117}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10130.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10130.json
new file mode 100644
index 0000000..b0acbf8
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10130.json
@@ -0,0 +1,1 @@
+{"name": "minior-orange-meteor", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 60, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10131.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10131.json
new file mode 100644
index 0000000..f646f13
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10131.json
@@ -0,0 +1,1 @@
+{"name": "minior-yellow-meteor", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 60, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10132.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10132.json
new file mode 100644
index 0000000..d1a7c8c
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10132.json
@@ -0,0 +1,1 @@
+{"name": "minior-green-meteor", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 60, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10133.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10133.json
new file mode 100644
index 0000000..422157c
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10133.json
@@ -0,0 +1,1 @@
+{"name": "minior-blue-meteor", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 60, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10134.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10134.json
new file mode 100644
index 0000000..2468a17
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10134.json
@@ -0,0 +1,1 @@
+{"name": "minior-indigo-meteor", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 60, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10135.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10135.json
new file mode 100644
index 0000000..5cb8148
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10135.json
@@ -0,0 +1,1 @@
+{"name": "minior-violet-meteor", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 60, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10136.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10136.json
new file mode 100644
index 0000000..826aa93
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10136.json
@@ -0,0 +1,1 @@
+{"name": "minior-red", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10137.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10137.json
new file mode 100644
index 0000000..9164a88
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10137.json
@@ -0,0 +1,1 @@
+{"name": "minior-orange", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10138.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10138.json
new file mode 100644
index 0000000..f06db14
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10138.json
@@ -0,0 +1,1 @@
+{"name": "minior-yellow", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10139.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10139.json
new file mode 100644
index 0000000..724a61e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10139.json
@@ -0,0 +1,1 @@
+{"name": "minior-green", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10140.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10140.json
new file mode 100644
index 0000000..8711e56
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10140.json
@@ -0,0 +1,1 @@
+{"name": "minior-blue", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10141.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10141.json
new file mode 100644
index 0000000..06500cc
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10141.json
@@ -0,0 +1,1 @@
+{"name": "minior-indigo", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10142.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10142.json
new file mode 100644
index 0000000..0bf250a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10142.json
@@ -0,0 +1,1 @@
+{"name": "minior-violet", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10143.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10143.json
new file mode 100644
index 0000000..dbb55ce
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10143.json
@@ -0,0 +1,1 @@
+{"name": "mimikyu-busted", "types": ["ghost", "fairy"], "stats": {"hp": 55, "attack": 90, "defense": 80, "special-attack": 50, "special-defense": 105, "speed": 96}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10144.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10144.json
new file mode 100644
index 0000000..76c60c1
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10144.json
@@ -0,0 +1,1 @@
+{"name": "mimikyu-totem-disguised", "types": ["ghost", "fairy"], "stats": {"hp": 55, "attack": 90, "defense": 80, "special-attack": 50, "special-defense": 105, "speed": 96}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10145.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10145.json
new file mode 100644
index 0000000..8fc3e7e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10145.json
@@ -0,0 +1,1 @@
+{"name": "mimikyu-totem-busted", "types": ["ghost", "fairy"], "stats": {"hp": 55, "attack": 90, "defense": 80, "special-attack": 50, "special-defense": 105, "speed": 96}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10146.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10146.json
new file mode 100644
index 0000000..15eddfc
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10146.json
@@ -0,0 +1,1 @@
+{"name": "kommo-o-totem", "types": ["dragon", "fighting"], "stats": {"hp": 75, "attack": 110, "defense": 125, "special-attack": 100, "special-defense": 105, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10147.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10147.json
new file mode 100644
index 0000000..4ebc903
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10147.json
@@ -0,0 +1,1 @@
+{"name": "magearna-original", "types": ["steel", "fairy"], "stats": {"hp": 80, "attack": 95, "defense": 115, "special-attack": 130, "special-defense": 115, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10148.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10148.json
new file mode 100644
index 0000000..6b9d4ce
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10148.json
@@ -0,0 +1,1 @@
+{"name": "pikachu-partner-cap", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10149.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10149.json
new file mode 100644
index 0000000..e3f0610
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10149.json
@@ -0,0 +1,1 @@
+{"name": "marowak-totem", "types": ["fire", "ghost"], "stats": {"hp": 60, "attack": 80, "defense": 110, "special-attack": 50, "special-defense": 80, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10150.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10150.json
new file mode 100644
index 0000000..466dee0
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10150.json
@@ -0,0 +1,1 @@
+{"name": "ribombee-totem", "types": ["bug", "fairy"], "stats": {"hp": 60, "attack": 55, "defense": 60, "special-attack": 95, "special-defense": 70, "speed": 124}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10151.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10151.json
new file mode 100644
index 0000000..63b4204
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10151.json
@@ -0,0 +1,1 @@
+{"name": "rockruff-own-tempo", "types": ["rock"], "stats": {"hp": 45, "attack": 65, "defense": 40, "special-attack": 30, "special-defense": 40, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10152.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10152.json
new file mode 100644
index 0000000..a5f991a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10152.json
@@ -0,0 +1,1 @@
+{"name": "lycanroc-dusk", "types": ["rock"], "stats": {"hp": 75, "attack": 117, "defense": 65, "special-attack": 55, "special-defense": 65, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10153.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10153.json
new file mode 100644
index 0000000..1d62243
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10153.json
@@ -0,0 +1,1 @@
+{"name": "araquanid-totem", "types": ["water", "bug"], "stats": {"hp": 68, "attack": 70, "defense": 92, "special-attack": 50, "special-defense": 132, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10154.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10154.json
new file mode 100644
index 0000000..f5f3505
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10154.json
@@ -0,0 +1,1 @@
+{"name": "togedemaru-totem", "types": ["electric", "steel"], "stats": {"hp": 65, "attack": 98, "defense": 63, "special-attack": 40, "special-defense": 73, "speed": 96}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10155.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10155.json
new file mode 100644
index 0000000..3f629a9
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10155.json
@@ -0,0 +1,1 @@
+{"name": "necrozma-dusk", "types": ["psychic", "steel"], "stats": {"hp": 97, "attack": 157, "defense": 127, "special-attack": 113, "special-defense": 109, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10156.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10156.json
new file mode 100644
index 0000000..f9f5cc5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10156.json
@@ -0,0 +1,1 @@
+{"name": "necrozma-dawn", "types": ["psychic", "ghost"], "stats": {"hp": 97, "attack": 113, "defense": 109, "special-attack": 157, "special-defense": 127, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_10157.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10157.json
new file mode 100644
index 0000000..f27a317
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_10157.json
@@ -0,0 +1,1 @@
+{"name": "necrozma-ultra", "types": ["psychic", "dragon"], "stats": {"hp": 97, "attack": 167, "defense": 97, "special-attack": 167, "special-defense": 97, "speed": 129}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_102.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_102.json
index ec5a5a2..b31451b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_102.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_102.json
@@ -1,1 +1,1 @@
-{"name": "exeggcute", "types": ["psychic", "grass"], "stats": {"speed": 40, "special-defense": 45, "special-attack": 60, "defense": 80, "attack": 40, "hp": 60}}
\ No newline at end of file
+{"name": "exeggcute", "types": ["grass", "psychic"], "stats": {"hp": 60, "attack": 40, "defense": 80, "special-attack": 60, "special-defense": 45, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_103.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_103.json
index a8d33e7..8b043ad 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_103.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_103.json
@@ -1,1 +1,1 @@
-{"name": "exeggutor", "types": ["psychic", "grass"], "stats": {"speed": 55, "special-defense": 75, "special-attack": 125, "defense": 85, "attack": 95, "hp": 95}}
\ No newline at end of file
+{"name": "exeggutor", "types": ["grass", "psychic"], "stats": {"hp": 95, "attack": 95, "defense": 85, "special-attack": 125, "special-defense": 75, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_104.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_104.json
index c51be78..9f9d5a5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_104.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_104.json
@@ -1,1 +1,1 @@
-{"name": "cubone", "types": ["ground"], "stats": {"speed": 35, "special-defense": 50, "special-attack": 40, "defense": 95, "attack": 50, "hp": 50}}
\ No newline at end of file
+{"name": "cubone", "types": ["ground"], "stats": {"hp": 50, "attack": 50, "defense": 95, "special-attack": 40, "special-defense": 50, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_105.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_105.json
index a435ab9..366285b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_105.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_105.json
@@ -1,1 +1,1 @@
-{"name": "marowak", "types": ["ground"], "stats": {"speed": 45, "special-defense": 80, "special-attack": 50, "defense": 110, "attack": 80, "hp": 60}}
\ No newline at end of file
+{"name": "marowak", "types": ["ground"], "stats": {"hp": 60, "attack": 80, "defense": 110, "special-attack": 50, "special-defense": 80, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_106.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_106.json
index 1119dd0..b40a54e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_106.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_106.json
@@ -1,1 +1,1 @@
-{"name": "hitmonlee", "types": ["fighting"], "stats": {"speed": 87, "special-defense": 110, "special-attack": 35, "defense": 53, "attack": 120, "hp": 50}}
\ No newline at end of file
+{"name": "hitmonlee", "types": ["fighting"], "stats": {"hp": 50, "attack": 120, "defense": 53, "special-attack": 35, "special-defense": 110, "speed": 87}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_107.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_107.json
index c44b698..8233a74 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_107.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_107.json
@@ -1,1 +1,1 @@
-{"name": "hitmonchan", "types": ["fighting"], "stats": {"speed": 76, "special-defense": 110, "special-attack": 35, "defense": 79, "attack": 105, "hp": 50}}
\ No newline at end of file
+{"name": "hitmonchan", "types": ["fighting"], "stats": {"hp": 50, "attack": 105, "defense": 79, "special-attack": 35, "special-defense": 110, "speed": 76}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_108.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_108.json
index 7232060..0ac2b1b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_108.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_108.json
@@ -1,1 +1,1 @@
-{"name": "lickitung", "types": ["normal"], "stats": {"speed": 30, "special-defense": 75, "special-attack": 60, "defense": 75, "attack": 55, "hp": 90}}
\ No newline at end of file
+{"name": "lickitung", "types": ["normal"], "stats": {"hp": 90, "attack": 55, "defense": 75, "special-attack": 60, "special-defense": 75, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_109.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_109.json
index d4a9c1e..79fe8cf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_109.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_109.json
@@ -1,1 +1,1 @@
-{"name": "koffing", "types": ["poison"], "stats": {"speed": 35, "special-defense": 45, "special-attack": 60, "defense": 95, "attack": 65, "hp": 40}}
\ No newline at end of file
+{"name": "koffing", "types": ["poison"], "stats": {"hp": 40, "attack": 65, "defense": 95, "special-attack": 60, "special-defense": 45, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_11.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_11.json
index edd0a73..d8e1794 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_11.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_11.json
@@ -1,1 +1,1 @@
-{"name": "metapod", "types": ["bug"], "stats": {"speed": 30, "special-defense": 25, "special-attack": 25, "defense": 55, "attack": 20, "hp": 50}}
\ No newline at end of file
+{"name": "metapod", "types": ["bug"], "stats": {"hp": 50, "attack": 20, "defense": 55, "special-attack": 25, "special-defense": 25, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_110.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_110.json
index 899d164..3b7daa2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_110.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_110.json
@@ -1,1 +1,1 @@
-{"name": "weezing", "types": ["poison"], "stats": {"speed": 60, "special-defense": 70, "special-attack": 85, "defense": 120, "attack": 90, "hp": 65}}
\ No newline at end of file
+{"name": "weezing", "types": ["poison"], "stats": {"hp": 65, "attack": 90, "defense": 120, "special-attack": 85, "special-defense": 70, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_111.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_111.json
index acfae34..4d4c59f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_111.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_111.json
@@ -1,1 +1,1 @@
-{"name": "rhyhorn", "types": ["rock", "ground"], "stats": {"speed": 25, "special-defense": 30, "special-attack": 30, "defense": 95, "attack": 85, "hp": 80}}
\ No newline at end of file
+{"name": "rhyhorn", "types": ["ground", "rock"], "stats": {"hp": 80, "attack": 85, "defense": 95, "special-attack": 30, "special-defense": 30, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_112.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_112.json
index d80fedb..d1749ee 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_112.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_112.json
@@ -1,1 +1,1 @@
-{"name": "rhydon", "types": ["rock", "ground"], "stats": {"speed": 40, "special-defense": 45, "special-attack": 45, "defense": 120, "attack": 130, "hp": 105}}
\ No newline at end of file
+{"name": "rhydon", "types": ["ground", "rock"], "stats": {"hp": 105, "attack": 130, "defense": 120, "special-attack": 45, "special-defense": 45, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_113.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_113.json
index f6c0fa9..fb8c159 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_113.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_113.json
@@ -1,1 +1,1 @@
-{"name": "chansey", "types": ["normal"], "stats": {"speed": 50, "special-defense": 105, "special-attack": 35, "defense": 5, "attack": 5, "hp": 250}}
\ No newline at end of file
+{"name": "chansey", "types": ["normal"], "stats": {"hp": 250, "attack": 5, "defense": 5, "special-attack": 35, "special-defense": 105, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_114.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_114.json
index a697990..b57514a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_114.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_114.json
@@ -1,1 +1,1 @@
-{"name": "tangela", "types": ["grass"], "stats": {"speed": 60, "special-defense": 40, "special-attack": 100, "defense": 115, "attack": 55, "hp": 65}}
\ No newline at end of file
+{"name": "tangela", "types": ["grass"], "stats": {"hp": 65, "attack": 55, "defense": 115, "special-attack": 100, "special-defense": 40, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_115.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_115.json
index 6ec7bc6..a3fb621 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_115.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_115.json
@@ -1,1 +1,1 @@
-{"name": "kangaskhan", "types": ["normal"], "stats": {"speed": 90, "special-defense": 80, "special-attack": 40, "defense": 80, "attack": 95, "hp": 105}}
\ No newline at end of file
+{"name": "kangaskhan", "types": ["normal"], "stats": {"hp": 105, "attack": 95, "defense": 80, "special-attack": 40, "special-defense": 80, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_116.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_116.json
index b486027..074ee57 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_116.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_116.json
@@ -1,1 +1,1 @@
-{"name": "horsea", "types": ["water"], "stats": {"speed": 60, "special-defense": 25, "special-attack": 70, "defense": 70, "attack": 40, "hp": 30}}
\ No newline at end of file
+{"name": "horsea", "types": ["water"], "stats": {"hp": 30, "attack": 40, "defense": 70, "special-attack": 70, "special-defense": 25, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_117.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_117.json
index fbc1f27..d52ccbb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_117.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_117.json
@@ -1,1 +1,1 @@
-{"name": "seadra", "types": ["water"], "stats": {"speed": 85, "special-defense": 45, "special-attack": 95, "defense": 95, "attack": 65, "hp": 55}}
\ No newline at end of file
+{"name": "seadra", "types": ["water"], "stats": {"hp": 55, "attack": 65, "defense": 95, "special-attack": 95, "special-defense": 45, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_118.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_118.json
index 399d775..bed80c0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_118.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_118.json
@@ -1,1 +1,1 @@
-{"name": "goldeen", "types": ["water"], "stats": {"speed": 63, "special-defense": 50, "special-attack": 35, "defense": 60, "attack": 67, "hp": 45}}
\ No newline at end of file
+{"name": "goldeen", "types": ["water"], "stats": {"hp": 45, "attack": 67, "defense": 60, "special-attack": 35, "special-defense": 50, "speed": 63}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_119.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_119.json
index 7335ed1..9bd2926 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_119.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_119.json
@@ -1,1 +1,1 @@
-{"name": "seaking", "types": ["water"], "stats": {"speed": 68, "special-defense": 80, "special-attack": 65, "defense": 65, "attack": 92, "hp": 80}}
\ No newline at end of file
+{"name": "seaking", "types": ["water"], "stats": {"hp": 80, "attack": 92, "defense": 65, "special-attack": 65, "special-defense": 80, "speed": 68}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_12.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_12.json
index b73c865..3e611ab 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_12.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_12.json
@@ -1,1 +1,1 @@
-{"name": "butterfree", "types": ["flying", "bug"], "stats": {"speed": 70, "special-defense": 80, "special-attack": 90, "defense": 50, "attack": 45, "hp": 60}}
\ No newline at end of file
+{"name": "butterfree", "types": ["bug", "flying"], "stats": {"hp": 60, "attack": 45, "defense": 50, "special-attack": 90, "special-defense": 80, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_120.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_120.json
index 18d4d1d..dc5da90 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_120.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_120.json
@@ -1,1 +1,1 @@
-{"name": "staryu", "types": ["water"], "stats": {"speed": 85, "special-defense": 55, "special-attack": 70, "defense": 55, "attack": 45, "hp": 30}}
\ No newline at end of file
+{"name": "staryu", "types": ["water"], "stats": {"hp": 30, "attack": 45, "defense": 55, "special-attack": 70, "special-defense": 55, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_121.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_121.json
index 525dfda..6c1fbbc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_121.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_121.json
@@ -1,1 +1,1 @@
-{"name": "starmie", "types": ["psychic", "water"], "stats": {"speed": 115, "special-defense": 85, "special-attack": 100, "defense": 85, "attack": 75, "hp": 60}}
\ No newline at end of file
+{"name": "starmie", "types": ["water", "psychic"], "stats": {"hp": 60, "attack": 75, "defense": 85, "special-attack": 100, "special-defense": 85, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_122.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_122.json
index 995c303..3177348 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_122.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_122.json
@@ -1,1 +1,1 @@
-{"name": "mr-mime", "types": ["fairy", "psychic"], "stats": {"speed": 90, "special-defense": 120, "special-attack": 100, "defense": 65, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "mr-mime", "types": ["psychic", "fairy"], "stats": {"hp": 40, "attack": 45, "defense": 65, "special-attack": 100, "special-defense": 120, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_123.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_123.json
index 4bdd65d..e4fcc44 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_123.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_123.json
@@ -1,1 +1,1 @@
-{"name": "scyther", "types": ["flying", "bug"], "stats": {"speed": 105, "special-defense": 80, "special-attack": 55, "defense": 80, "attack": 110, "hp": 70}}
\ No newline at end of file
+{"name": "scyther", "types": ["bug", "flying"], "stats": {"hp": 70, "attack": 110, "defense": 80, "special-attack": 55, "special-defense": 80, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_124.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_124.json
index cb30231..fcfe43e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_124.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_124.json
@@ -1,1 +1,1 @@
-{"name": "jynx", "types": ["psychic", "ice"], "stats": {"speed": 95, "special-defense": 95, "special-attack": 115, "defense": 35, "attack": 50, "hp": 65}}
\ No newline at end of file
+{"name": "jynx", "types": ["ice", "psychic"], "stats": {"hp": 65, "attack": 50, "defense": 35, "special-attack": 115, "special-defense": 95, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_125.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_125.json
index 1d589f5..8d8d20d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_125.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_125.json
@@ -1,1 +1,1 @@
-{"name": "electabuzz", "types": ["electric"], "stats": {"speed": 105, "special-defense": 85, "special-attack": 95, "defense": 57, "attack": 83, "hp": 65}}
\ No newline at end of file
+{"name": "electabuzz", "types": ["electric"], "stats": {"hp": 65, "attack": 83, "defense": 57, "special-attack": 95, "special-defense": 85, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_126.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_126.json
index e6649b7..824ea8b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_126.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_126.json
@@ -1,1 +1,1 @@
-{"name": "magmar", "types": ["fire"], "stats": {"speed": 93, "special-defense": 85, "special-attack": 100, "defense": 57, "attack": 95, "hp": 65}}
\ No newline at end of file
+{"name": "magmar", "types": ["fire"], "stats": {"hp": 65, "attack": 95, "defense": 57, "special-attack": 100, "special-defense": 85, "speed": 93}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_127.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_127.json
index c22ceac..0ae0885 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_127.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_127.json
@@ -1,1 +1,1 @@
-{"name": "pinsir", "types": ["bug"], "stats": {"speed": 85, "special-defense": 70, "special-attack": 55, "defense": 100, "attack": 125, "hp": 65}}
\ No newline at end of file
+{"name": "pinsir", "types": ["bug"], "stats": {"hp": 65, "attack": 125, "defense": 100, "special-attack": 55, "special-defense": 70, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_128.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_128.json
index a0ec272..9fb4295 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_128.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_128.json
@@ -1,1 +1,1 @@
-{"name": "tauros", "types": ["normal"], "stats": {"speed": 110, "special-defense": 70, "special-attack": 40, "defense": 95, "attack": 100, "hp": 75}}
\ No newline at end of file
+{"name": "tauros", "types": ["normal"], "stats": {"hp": 75, "attack": 100, "defense": 95, "special-attack": 40, "special-defense": 70, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_129.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_129.json
index 5082fa8..5ef01ab 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_129.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_129.json
@@ -1,1 +1,1 @@
-{"name": "magikarp", "types": ["water"], "stats": {"speed": 80, "special-defense": 20, "special-attack": 15, "defense": 55, "attack": 10, "hp": 20}}
\ No newline at end of file
+{"name": "magikarp", "types": ["water"], "stats": {"hp": 20, "attack": 10, "defense": 55, "special-attack": 15, "special-defense": 20, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_13.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_13.json
index 617ecfa..21ddde2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_13.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_13.json
@@ -1,1 +1,1 @@
-{"name": "weedle", "types": ["poison", "bug"], "stats": {"speed": 50, "special-defense": 20, "special-attack": 20, "defense": 30, "attack": 35, "hp": 40}}
\ No newline at end of file
+{"name": "weedle", "types": ["bug", "poison"], "stats": {"hp": 40, "attack": 35, "defense": 30, "special-attack": 20, "special-defense": 20, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_130.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_130.json
index eda94db..0670ad9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_130.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_130.json
@@ -1,1 +1,1 @@
-{"name": "gyarados", "types": ["flying", "water"], "stats": {"speed": 81, "special-defense": 100, "special-attack": 60, "defense": 79, "attack": 125, "hp": 95}}
\ No newline at end of file
+{"name": "gyarados", "types": ["water", "flying"], "stats": {"hp": 95, "attack": 125, "defense": 79, "special-attack": 60, "special-defense": 100, "speed": 81}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_131.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_131.json
index 8f3532f..706b48d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_131.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_131.json
@@ -1,1 +1,1 @@
-{"name": "lapras", "types": ["ice", "water"], "stats": {"speed": 60, "special-defense": 95, "special-attack": 85, "defense": 80, "attack": 85, "hp": 130}}
\ No newline at end of file
+{"name": "lapras", "types": ["water", "ice"], "stats": {"hp": 130, "attack": 85, "defense": 80, "special-attack": 85, "special-defense": 95, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_132.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_132.json
index 7f50fbf..64558fb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_132.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_132.json
@@ -1,1 +1,1 @@
-{"name": "ditto", "types": ["normal"], "stats": {"speed": 48, "special-defense": 48, "special-attack": 48, "defense": 48, "attack": 48, "hp": 48}}
\ No newline at end of file
+{"name": "ditto", "types": ["normal"], "stats": {"hp": 48, "attack": 48, "defense": 48, "special-attack": 48, "special-defense": 48, "speed": 48}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_133.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_133.json
index 5e82149..b81c362 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_133.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_133.json
@@ -1,1 +1,1 @@
-{"name": "eevee", "types": ["normal"], "stats": {"speed": 55, "special-defense": 65, "special-attack": 45, "defense": 50, "attack": 55, "hp": 55}}
\ No newline at end of file
+{"name": "eevee", "types": ["normal"], "stats": {"hp": 55, "attack": 55, "defense": 50, "special-attack": 45, "special-defense": 65, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_134.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_134.json
index 1837337..6370a64 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_134.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_134.json
@@ -1,1 +1,1 @@
-{"name": "vaporeon", "types": ["water"], "stats": {"speed": 65, "special-defense": 95, "special-attack": 110, "defense": 60, "attack": 65, "hp": 130}}
\ No newline at end of file
+{"name": "vaporeon", "types": ["water"], "stats": {"hp": 130, "attack": 65, "defense": 60, "special-attack": 110, "special-defense": 95, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_135.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_135.json
index 42119e0..b8012f5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_135.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_135.json
@@ -1,1 +1,1 @@
-{"name": "jolteon", "types": ["electric"], "stats": {"speed": 130, "special-defense": 95, "special-attack": 110, "defense": 60, "attack": 65, "hp": 65}}
\ No newline at end of file
+{"name": "jolteon", "types": ["electric"], "stats": {"hp": 65, "attack": 65, "defense": 60, "special-attack": 110, "special-defense": 95, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_136.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_136.json
index e512331..ea7ce8a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_136.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_136.json
@@ -1,1 +1,1 @@
-{"name": "flareon", "types": ["fire"], "stats": {"speed": 65, "special-defense": 110, "special-attack": 95, "defense": 60, "attack": 130, "hp": 65}}
\ No newline at end of file
+{"name": "flareon", "types": ["fire"], "stats": {"hp": 65, "attack": 130, "defense": 60, "special-attack": 95, "special-defense": 110, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_137.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_137.json
index d5fee90..810ad9b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_137.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_137.json
@@ -1,1 +1,1 @@
-{"name": "porygon", "types": ["normal"], "stats": {"speed": 40, "special-defense": 75, "special-attack": 85, "defense": 70, "attack": 60, "hp": 65}}
\ No newline at end of file
+{"name": "porygon", "types": ["normal"], "stats": {"hp": 65, "attack": 60, "defense": 70, "special-attack": 85, "special-defense": 75, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_138.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_138.json
index ccd01fd..2078aad 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_138.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_138.json
@@ -1,1 +1,1 @@
-{"name": "omanyte", "types": ["water", "rock"], "stats": {"speed": 35, "special-defense": 55, "special-attack": 90, "defense": 100, "attack": 40, "hp": 35}}
\ No newline at end of file
+{"name": "omanyte", "types": ["rock", "water"], "stats": {"hp": 35, "attack": 40, "defense": 100, "special-attack": 90, "special-defense": 55, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_139.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_139.json
index a42c840..8ef6bbf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_139.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_139.json
@@ -1,1 +1,1 @@
-{"name": "omastar", "types": ["water", "rock"], "stats": {"speed": 55, "special-defense": 70, "special-attack": 115, "defense": 125, "attack": 60, "hp": 70}}
\ No newline at end of file
+{"name": "omastar", "types": ["rock", "water"], "stats": {"hp": 70, "attack": 60, "defense": 125, "special-attack": 115, "special-defense": 70, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_14.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_14.json
index 98d782a..009cc72 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_14.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_14.json
@@ -1,1 +1,1 @@
-{"name": "kakuna", "types": ["poison", "bug"], "stats": {"speed": 35, "special-defense": 25, "special-attack": 25, "defense": 50, "attack": 25, "hp": 45}}
\ No newline at end of file
+{"name": "kakuna", "types": ["bug", "poison"], "stats": {"hp": 45, "attack": 25, "defense": 50, "special-attack": 25, "special-defense": 25, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_140.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_140.json
index 8766885..b924969 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_140.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_140.json
@@ -1,1 +1,1 @@
-{"name": "kabuto", "types": ["water", "rock"], "stats": {"speed": 55, "special-defense": 45, "special-attack": 55, "defense": 90, "attack": 80, "hp": 30}}
\ No newline at end of file
+{"name": "kabuto", "types": ["rock", "water"], "stats": {"hp": 30, "attack": 80, "defense": 90, "special-attack": 55, "special-defense": 45, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_141.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_141.json
index dd392d0..cdb17ac 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_141.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_141.json
@@ -1,1 +1,1 @@
-{"name": "kabutops", "types": ["water", "rock"], "stats": {"speed": 80, "special-defense": 70, "special-attack": 65, "defense": 105, "attack": 115, "hp": 60}}
\ No newline at end of file
+{"name": "kabutops", "types": ["rock", "water"], "stats": {"hp": 60, "attack": 115, "defense": 105, "special-attack": 65, "special-defense": 70, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_142.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_142.json
index 824f57f..e0fa256 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_142.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_142.json
@@ -1,1 +1,1 @@
-{"name": "aerodactyl", "types": ["flying", "rock"], "stats": {"speed": 130, "special-defense": 75, "special-attack": 60, "defense": 65, "attack": 105, "hp": 80}}
\ No newline at end of file
+{"name": "aerodactyl", "types": ["rock", "flying"], "stats": {"hp": 80, "attack": 105, "defense": 65, "special-attack": 60, "special-defense": 75, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_143.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_143.json
index 007e9f3..c29de6a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_143.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_143.json
@@ -1,1 +1,1 @@
-{"name": "snorlax", "types": ["normal"], "stats": {"speed": 30, "special-defense": 110, "special-attack": 65, "defense": 65, "attack": 110, "hp": 160}}
\ No newline at end of file
+{"name": "snorlax", "types": ["normal"], "stats": {"hp": 160, "attack": 110, "defense": 65, "special-attack": 65, "special-defense": 110, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_144.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_144.json
index dca85c9..1c1c00e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_144.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_144.json
@@ -1,1 +1,1 @@
-{"name": "articuno", "types": ["flying", "ice"], "stats": {"speed": 85, "special-defense": 125, "special-attack": 95, "defense": 100, "attack": 85, "hp": 90}}
\ No newline at end of file
+{"name": "articuno", "types": ["ice", "flying"], "stats": {"hp": 90, "attack": 85, "defense": 100, "special-attack": 95, "special-defense": 125, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_145.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_145.json
index 8752ea7..6d91467 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_145.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_145.json
@@ -1,1 +1,1 @@
-{"name": "zapdos", "types": ["flying", "electric"], "stats": {"speed": 100, "special-defense": 90, "special-attack": 125, "defense": 85, "attack": 90, "hp": 90}}
\ No newline at end of file
+{"name": "zapdos", "types": ["electric", "flying"], "stats": {"hp": 90, "attack": 90, "defense": 85, "special-attack": 125, "special-defense": 90, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_146.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_146.json
index cedb1d2..b796e48 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_146.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_146.json
@@ -1,1 +1,1 @@
-{"name": "moltres", "types": ["flying", "fire"], "stats": {"speed": 90, "special-defense": 85, "special-attack": 125, "defense": 90, "attack": 100, "hp": 90}}
\ No newline at end of file
+{"name": "moltres", "types": ["fire", "flying"], "stats": {"hp": 90, "attack": 100, "defense": 90, "special-attack": 125, "special-defense": 85, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_147.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_147.json
index a7d7328..c2f400b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_147.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_147.json
@@ -1,1 +1,1 @@
-{"name": "dratini", "types": ["dragon"], "stats": {"speed": 50, "special-defense": 50, "special-attack": 50, "defense": 45, "attack": 64, "hp": 41}}
\ No newline at end of file
+{"name": "dratini", "types": ["dragon"], "stats": {"hp": 41, "attack": 64, "defense": 45, "special-attack": 50, "special-defense": 50, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_148.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_148.json
index ae39570..96470eb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_148.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_148.json
@@ -1,1 +1,1 @@
-{"name": "dragonair", "types": ["dragon"], "stats": {"speed": 70, "special-defense": 70, "special-attack": 70, "defense": 65, "attack": 84, "hp": 61}}
\ No newline at end of file
+{"name": "dragonair", "types": ["dragon"], "stats": {"hp": 61, "attack": 84, "defense": 65, "special-attack": 70, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_149.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_149.json
index 550f163..73f5b33 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_149.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_149.json
@@ -1,1 +1,1 @@
-{"name": "dragonite", "types": ["flying", "dragon"], "stats": {"speed": 80, "special-defense": 100, "special-attack": 100, "defense": 95, "attack": 134, "hp": 91}}
\ No newline at end of file
+{"name": "dragonite", "types": ["dragon", "flying"], "stats": {"hp": 91, "attack": 134, "defense": 95, "special-attack": 100, "special-defense": 100, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_15.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_15.json
index 5109909..6bc9c86 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_15.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_15.json
@@ -1,1 +1,1 @@
-{"name": "beedrill", "types": ["poison", "bug"], "stats": {"speed": 75, "special-defense": 80, "special-attack": 45, "defense": 40, "attack": 90, "hp": 65}}
\ No newline at end of file
+{"name": "beedrill", "types": ["bug", "poison"], "stats": {"hp": 65, "attack": 90, "defense": 40, "special-attack": 45, "special-defense": 80, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_150.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_150.json
index 285b244..3d94fe5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_150.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_150.json
@@ -1,1 +1,1 @@
-{"name": "mewtwo", "types": ["psychic"], "stats": {"speed": 130, "special-defense": 90, "special-attack": 154, "defense": 90, "attack": 110, "hp": 106}}
\ No newline at end of file
+{"name": "mewtwo", "types": ["psychic"], "stats": {"hp": 106, "attack": 110, "defense": 90, "special-attack": 154, "special-defense": 90, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_151.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_151.json
index e226d44..8fb01af 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_151.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_151.json
@@ -1,1 +1,1 @@
-{"name": "mew", "types": ["psychic"], "stats": {"speed": 100, "special-defense": 100, "special-attack": 100, "defense": 100, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "mew", "types": ["psychic"], "stats": {"hp": 100, "attack": 100, "defense": 100, "special-attack": 100, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_152.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_152.json
index 2a04d60..180db73 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_152.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_152.json
@@ -1,1 +1,1 @@
-{"name": "chikorita", "types": ["grass"], "stats": {"speed": 45, "special-defense": 65, "special-attack": 49, "defense": 65, "attack": 49, "hp": 45}}
\ No newline at end of file
+{"name": "chikorita", "types": ["grass"], "stats": {"hp": 45, "attack": 49, "defense": 65, "special-attack": 49, "special-defense": 65, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_153.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_153.json
index 26fdf45..39e5c75 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_153.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_153.json
@@ -1,1 +1,1 @@
-{"name": "bayleef", "types": ["grass"], "stats": {"speed": 60, "special-defense": 80, "special-attack": 63, "defense": 80, "attack": 62, "hp": 60}}
\ No newline at end of file
+{"name": "bayleef", "types": ["grass"], "stats": {"hp": 60, "attack": 62, "defense": 80, "special-attack": 63, "special-defense": 80, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_154.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_154.json
index 72708d5..c3570cd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_154.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_154.json
@@ -1,1 +1,1 @@
-{"name": "meganium", "types": ["grass"], "stats": {"speed": 80, "special-defense": 100, "special-attack": 83, "defense": 100, "attack": 82, "hp": 80}}
\ No newline at end of file
+{"name": "meganium", "types": ["grass"], "stats": {"hp": 80, "attack": 82, "defense": 100, "special-attack": 83, "special-defense": 100, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_155.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_155.json
index af24d58..00b7194 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_155.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_155.json
@@ -1,1 +1,1 @@
-{"name": "cyndaquil", "types": ["fire"], "stats": {"speed": 65, "special-defense": 50, "special-attack": 60, "defense": 43, "attack": 52, "hp": 39}}
\ No newline at end of file
+{"name": "cyndaquil", "types": ["fire"], "stats": {"hp": 39, "attack": 52, "defense": 43, "special-attack": 60, "special-defense": 50, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_156.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_156.json
index 3a80dfc..a76a866 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_156.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_156.json
@@ -1,1 +1,1 @@
-{"name": "quilava", "types": ["fire"], "stats": {"speed": 80, "special-defense": 65, "special-attack": 80, "defense": 58, "attack": 64, "hp": 58}}
\ No newline at end of file
+{"name": "quilava", "types": ["fire"], "stats": {"hp": 58, "attack": 64, "defense": 58, "special-attack": 80, "special-defense": 65, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_157.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_157.json
index d23cfc7..99c1c5b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_157.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_157.json
@@ -1,1 +1,1 @@
-{"name": "typhlosion", "types": ["fire"], "stats": {"speed": 100, "special-defense": 85, "special-attack": 109, "defense": 78, "attack": 84, "hp": 78}}
\ No newline at end of file
+{"name": "typhlosion", "types": ["fire"], "stats": {"hp": 78, "attack": 84, "defense": 78, "special-attack": 109, "special-defense": 85, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_158.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_158.json
index 7d890e9..545787f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_158.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_158.json
@@ -1,1 +1,1 @@
-{"name": "totodile", "types": ["water"], "stats": {"speed": 43, "special-defense": 48, "special-attack": 44, "defense": 64, "attack": 65, "hp": 50}}
\ No newline at end of file
+{"name": "totodile", "types": ["water"], "stats": {"hp": 50, "attack": 65, "defense": 64, "special-attack": 44, "special-defense": 48, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_159.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_159.json
index ad2b887..1b20e2f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_159.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_159.json
@@ -1,1 +1,1 @@
-{"name": "croconaw", "types": ["water"], "stats": {"speed": 58, "special-defense": 63, "special-attack": 59, "defense": 80, "attack": 80, "hp": 65}}
\ No newline at end of file
+{"name": "croconaw", "types": ["water"], "stats": {"hp": 65, "attack": 80, "defense": 80, "special-attack": 59, "special-defense": 63, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_16.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_16.json
index 14e0c35..52c0be7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_16.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_16.json
@@ -1,1 +1,1 @@
-{"name": "pidgey", "types": ["flying", "normal"], "stats": {"speed": 56, "special-defense": 35, "special-attack": 35, "defense": 40, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "pidgey", "types": ["normal", "flying"], "stats": {"hp": 40, "attack": 45, "defense": 40, "special-attack": 35, "special-defense": 35, "speed": 56}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_160.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_160.json
index 64a63f9..6a284b0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_160.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_160.json
@@ -1,1 +1,1 @@
-{"name": "feraligatr", "types": ["water"], "stats": {"speed": 78, "special-defense": 83, "special-attack": 79, "defense": 100, "attack": 105, "hp": 85}}
\ No newline at end of file
+{"name": "feraligatr", "types": ["water"], "stats": {"hp": 85, "attack": 105, "defense": 100, "special-attack": 79, "special-defense": 83, "speed": 78}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_161.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_161.json
index 7304108..abf1548 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_161.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_161.json
@@ -1,1 +1,1 @@
-{"name": "sentret", "types": ["normal"], "stats": {"speed": 20, "special-defense": 45, "special-attack": 35, "defense": 34, "attack": 46, "hp": 35}}
\ No newline at end of file
+{"name": "sentret", "types": ["normal"], "stats": {"hp": 35, "attack": 46, "defense": 34, "special-attack": 35, "special-defense": 45, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_162.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_162.json
index 6813dbf..1b454cb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_162.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_162.json
@@ -1,1 +1,1 @@
-{"name": "furret", "types": ["normal"], "stats": {"speed": 90, "special-defense": 55, "special-attack": 45, "defense": 64, "attack": 76, "hp": 85}}
\ No newline at end of file
+{"name": "furret", "types": ["normal"], "stats": {"hp": 85, "attack": 76, "defense": 64, "special-attack": 45, "special-defense": 55, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_163.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_163.json
index 7fe74c8..a891cb2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_163.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_163.json
@@ -1,1 +1,1 @@
-{"name": "hoothoot", "types": ["flying", "normal"], "stats": {"speed": 50, "special-defense": 56, "special-attack": 36, "defense": 30, "attack": 30, "hp": 60}}
\ No newline at end of file
+{"name": "hoothoot", "types": ["normal", "flying"], "stats": {"hp": 60, "attack": 30, "defense": 30, "special-attack": 36, "special-defense": 56, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_164.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_164.json
index 4421f38..a7eaa94 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_164.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_164.json
@@ -1,1 +1,1 @@
-{"name": "noctowl", "types": ["flying", "normal"], "stats": {"speed": 70, "special-defense": 96, "special-attack": 86, "defense": 50, "attack": 50, "hp": 100}}
\ No newline at end of file
+{"name": "noctowl", "types": ["normal", "flying"], "stats": {"hp": 100, "attack": 50, "defense": 50, "special-attack": 86, "special-defense": 96, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_165.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_165.json
index 0f4d44b..5e4f806 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_165.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_165.json
@@ -1,1 +1,1 @@
-{"name": "ledyba", "types": ["flying", "bug"], "stats": {"speed": 55, "special-defense": 80, "special-attack": 40, "defense": 30, "attack": 20, "hp": 40}}
\ No newline at end of file
+{"name": "ledyba", "types": ["bug", "flying"], "stats": {"hp": 40, "attack": 20, "defense": 30, "special-attack": 40, "special-defense": 80, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_166.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_166.json
index da0b039..98e42cd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_166.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_166.json
@@ -1,1 +1,1 @@
-{"name": "ledian", "types": ["flying", "bug"], "stats": {"speed": 85, "special-defense": 110, "special-attack": 55, "defense": 50, "attack": 35, "hp": 55}}
\ No newline at end of file
+{"name": "ledian", "types": ["bug", "flying"], "stats": {"hp": 55, "attack": 35, "defense": 50, "special-attack": 55, "special-defense": 110, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_167.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_167.json
index 3015224..7b3a778 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_167.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_167.json
@@ -1,1 +1,1 @@
-{"name": "spinarak", "types": ["poison", "bug"], "stats": {"speed": 30, "special-defense": 40, "special-attack": 40, "defense": 40, "attack": 60, "hp": 40}}
\ No newline at end of file
+{"name": "spinarak", "types": ["bug", "poison"], "stats": {"hp": 40, "attack": 60, "defense": 40, "special-attack": 40, "special-defense": 40, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_168.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_168.json
index b20f5a2..eb3f119 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_168.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_168.json
@@ -1,1 +1,1 @@
-{"name": "ariados", "types": ["poison", "bug"], "stats": {"speed": 40, "special-defense": 70, "special-attack": 60, "defense": 70, "attack": 90, "hp": 70}}
\ No newline at end of file
+{"name": "ariados", "types": ["bug", "poison"], "stats": {"hp": 70, "attack": 90, "defense": 70, "special-attack": 60, "special-defense": 70, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_169.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_169.json
index 057631f..db24f2c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_169.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_169.json
@@ -1,1 +1,1 @@
-{"name": "crobat", "types": ["flying", "poison"], "stats": {"speed": 130, "special-defense": 80, "special-attack": 70, "defense": 80, "attack": 90, "hp": 85}}
\ No newline at end of file
+{"name": "crobat", "types": ["poison", "flying"], "stats": {"hp": 85, "attack": 90, "defense": 80, "special-attack": 70, "special-defense": 80, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_17.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_17.json
index c6452ff..a8c4fdb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_17.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_17.json
@@ -1,1 +1,1 @@
-{"name": "pidgeotto", "types": ["flying", "normal"], "stats": {"speed": 71, "special-defense": 50, "special-attack": 50, "defense": 55, "attack": 60, "hp": 63}}
\ No newline at end of file
+{"name": "pidgeotto", "types": ["normal", "flying"], "stats": {"hp": 63, "attack": 60, "defense": 55, "special-attack": 50, "special-defense": 50, "speed": 71}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_170.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_170.json
index b6d87bb..717d86c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_170.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_170.json
@@ -1,1 +1,1 @@
-{"name": "chinchou", "types": ["electric", "water"], "stats": {"speed": 67, "special-defense": 56, "special-attack": 56, "defense": 38, "attack": 38, "hp": 75}}
\ No newline at end of file
+{"name": "chinchou", "types": ["water", "electric"], "stats": {"hp": 75, "attack": 38, "defense": 38, "special-attack": 56, "special-defense": 56, "speed": 67}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_171.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_171.json
index 976fad5..a6071cf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_171.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_171.json
@@ -1,1 +1,1 @@
-{"name": "lanturn", "types": ["electric", "water"], "stats": {"speed": 67, "special-defense": 76, "special-attack": 76, "defense": 58, "attack": 58, "hp": 125}}
\ No newline at end of file
+{"name": "lanturn", "types": ["water", "electric"], "stats": {"hp": 125, "attack": 58, "defense": 58, "special-attack": 76, "special-defense": 76, "speed": 67}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_172.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_172.json
index b5a0ed8..ac2d863 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_172.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_172.json
@@ -1,1 +1,1 @@
-{"name": "pichu", "types": ["electric"], "stats": {"speed": 60, "special-defense": 35, "special-attack": 35, "defense": 15, "attack": 40, "hp": 20}}
\ No newline at end of file
+{"name": "pichu", "types": ["electric"], "stats": {"hp": 20, "attack": 40, "defense": 15, "special-attack": 35, "special-defense": 35, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_173.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_173.json
index 9c7030e..a014831 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_173.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_173.json
@@ -1,1 +1,1 @@
-{"name": "cleffa", "types": ["fairy"], "stats": {"speed": 15, "special-defense": 55, "special-attack": 45, "defense": 28, "attack": 25, "hp": 50}}
\ No newline at end of file
+{"name": "cleffa", "types": ["fairy"], "stats": {"hp": 50, "attack": 25, "defense": 28, "special-attack": 45, "special-defense": 55, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_174.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_174.json
index 626e016..56df3ae 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_174.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_174.json
@@ -1,1 +1,1 @@
-{"name": "igglybuff", "types": ["fairy", "normal"], "stats": {"speed": 15, "special-defense": 20, "special-attack": 40, "defense": 15, "attack": 30, "hp": 90}}
\ No newline at end of file
+{"name": "igglybuff", "types": ["normal", "fairy"], "stats": {"hp": 90, "attack": 30, "defense": 15, "special-attack": 40, "special-defense": 20, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_175.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_175.json
index 4debd12..652d53b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_175.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_175.json
@@ -1,1 +1,1 @@
-{"name": "togepi", "types": ["fairy"], "stats": {"speed": 20, "special-defense": 65, "special-attack": 40, "defense": 65, "attack": 20, "hp": 35}}
\ No newline at end of file
+{"name": "togepi", "types": ["fairy"], "stats": {"hp": 35, "attack": 20, "defense": 65, "special-attack": 40, "special-defense": 65, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_176.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_176.json
index 5465d87..2901220 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_176.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_176.json
@@ -1,1 +1,1 @@
-{"name": "togetic", "types": ["flying", "fairy"], "stats": {"speed": 40, "special-defense": 105, "special-attack": 80, "defense": 85, "attack": 40, "hp": 55}}
\ No newline at end of file
+{"name": "togetic", "types": ["fairy", "flying"], "stats": {"hp": 55, "attack": 40, "defense": 85, "special-attack": 80, "special-defense": 105, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_177.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_177.json
index 7e07b64..a038066 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_177.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_177.json
@@ -1,1 +1,1 @@
-{"name": "natu", "types": ["flying", "psychic"], "stats": {"speed": 70, "special-defense": 45, "special-attack": 70, "defense": 45, "attack": 50, "hp": 40}}
\ No newline at end of file
+{"name": "natu", "types": ["psychic", "flying"], "stats": {"hp": 40, "attack": 50, "defense": 45, "special-attack": 70, "special-defense": 45, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_178.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_178.json
index a744c43..2575bbf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_178.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_178.json
@@ -1,1 +1,1 @@
-{"name": "xatu", "types": ["flying", "psychic"], "stats": {"speed": 95, "special-defense": 70, "special-attack": 95, "defense": 70, "attack": 75, "hp": 65}}
\ No newline at end of file
+{"name": "xatu", "types": ["psychic", "flying"], "stats": {"hp": 65, "attack": 75, "defense": 70, "special-attack": 95, "special-defense": 70, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_179.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_179.json
index 66e976d..a0a33f5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_179.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_179.json
@@ -1,1 +1,1 @@
-{"name": "mareep", "types": ["electric"], "stats": {"speed": 35, "special-defense": 45, "special-attack": 65, "defense": 40, "attack": 40, "hp": 55}}
\ No newline at end of file
+{"name": "mareep", "types": ["electric"], "stats": {"hp": 55, "attack": 40, "defense": 40, "special-attack": 65, "special-defense": 45, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_18.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_18.json
index 5345885..5108af2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_18.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_18.json
@@ -1,1 +1,1 @@
-{"name": "pidgeot", "types": ["flying", "normal"], "stats": {"speed": 101, "special-defense": 70, "special-attack": 70, "defense": 75, "attack": 80, "hp": 83}}
\ No newline at end of file
+{"name": "pidgeot", "types": ["normal", "flying"], "stats": {"hp": 83, "attack": 80, "defense": 75, "special-attack": 70, "special-defense": 70, "speed": 101}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_180.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_180.json
index b32d385..3937696 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_180.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_180.json
@@ -1,1 +1,1 @@
-{"name": "flaaffy", "types": ["electric"], "stats": {"speed": 45, "special-defense": 60, "special-attack": 80, "defense": 55, "attack": 55, "hp": 70}}
\ No newline at end of file
+{"name": "flaaffy", "types": ["electric"], "stats": {"hp": 70, "attack": 55, "defense": 55, "special-attack": 80, "special-defense": 60, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_181.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_181.json
index 44d4221..4cf4b4a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_181.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_181.json
@@ -1,1 +1,1 @@
-{"name": "ampharos", "types": ["electric"], "stats": {"speed": 55, "special-defense": 90, "special-attack": 115, "defense": 85, "attack": 75, "hp": 90}}
\ No newline at end of file
+{"name": "ampharos", "types": ["electric"], "stats": {"hp": 90, "attack": 75, "defense": 85, "special-attack": 115, "special-defense": 90, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_182.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_182.json
index da421ae..f10c0af 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_182.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_182.json
@@ -1,1 +1,1 @@
-{"name": "bellossom", "types": ["grass"], "stats": {"speed": 50, "special-defense": 100, "special-attack": 90, "defense": 95, "attack": 80, "hp": 75}}
\ No newline at end of file
+{"name": "bellossom", "types": ["grass"], "stats": {"hp": 75, "attack": 80, "defense": 95, "special-attack": 90, "special-defense": 100, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_183.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_183.json
index dbc3bd1..34c23d6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_183.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_183.json
@@ -1,1 +1,1 @@
-{"name": "marill", "types": ["fairy", "water"], "stats": {"speed": 40, "special-defense": 50, "special-attack": 20, "defense": 50, "attack": 20, "hp": 70}}
\ No newline at end of file
+{"name": "marill", "types": ["water", "fairy"], "stats": {"hp": 70, "attack": 20, "defense": 50, "special-attack": 20, "special-defense": 50, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_184.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_184.json
index 5b035fb..96f9332 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_184.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_184.json
@@ -1,1 +1,1 @@
-{"name": "azumarill", "types": ["fairy", "water"], "stats": {"speed": 50, "special-defense": 80, "special-attack": 60, "defense": 80, "attack": 50, "hp": 100}}
\ No newline at end of file
+{"name": "azumarill", "types": ["water", "fairy"], "stats": {"hp": 100, "attack": 50, "defense": 80, "special-attack": 60, "special-defense": 80, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_185.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_185.json
index 20eaa67..43c3187 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_185.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_185.json
@@ -1,1 +1,1 @@
-{"name": "sudowoodo", "types": ["rock"], "stats": {"speed": 30, "special-defense": 65, "special-attack": 30, "defense": 115, "attack": 100, "hp": 70}}
\ No newline at end of file
+{"name": "sudowoodo", "types": ["rock"], "stats": {"hp": 70, "attack": 100, "defense": 115, "special-attack": 30, "special-defense": 65, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_186.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_186.json
index 3692b34..ffda91a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_186.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_186.json
@@ -1,1 +1,1 @@
-{"name": "politoed", "types": ["water"], "stats": {"speed": 70, "special-defense": 100, "special-attack": 90, "defense": 75, "attack": 75, "hp": 90}}
\ No newline at end of file
+{"name": "politoed", "types": ["water"], "stats": {"hp": 90, "attack": 75, "defense": 75, "special-attack": 90, "special-defense": 100, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_187.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_187.json
index c617eb5..2ee647e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_187.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_187.json
@@ -1,1 +1,1 @@
-{"name": "hoppip", "types": ["flying", "grass"], "stats": {"speed": 50, "special-defense": 55, "special-attack": 35, "defense": 40, "attack": 35, "hp": 35}}
\ No newline at end of file
+{"name": "hoppip", "types": ["grass", "flying"], "stats": {"hp": 35, "attack": 35, "defense": 40, "special-attack": 35, "special-defense": 55, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_188.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_188.json
index c64337d..c6a5a77 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_188.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_188.json
@@ -1,1 +1,1 @@
-{"name": "skiploom", "types": ["flying", "grass"], "stats": {"speed": 80, "special-defense": 65, "special-attack": 45, "defense": 50, "attack": 45, "hp": 55}}
\ No newline at end of file
+{"name": "skiploom", "types": ["grass", "flying"], "stats": {"hp": 55, "attack": 45, "defense": 50, "special-attack": 45, "special-defense": 65, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_189.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_189.json
index 5361938..1d84fdd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_189.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_189.json
@@ -1,1 +1,1 @@
-{"name": "jumpluff", "types": ["flying", "grass"], "stats": {"speed": 110, "special-defense": 95, "special-attack": 55, "defense": 70, "attack": 55, "hp": 75}}
\ No newline at end of file
+{"name": "jumpluff", "types": ["grass", "flying"], "stats": {"hp": 75, "attack": 55, "defense": 70, "special-attack": 55, "special-defense": 95, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_19.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_19.json
index aadc5fc..cd102db 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_19.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_19.json
@@ -1,1 +1,1 @@
-{"name": "rattata", "types": ["normal"], "stats": {"speed": 72, "special-defense": 35, "special-attack": 25, "defense": 35, "attack": 56, "hp": 30}}
\ No newline at end of file
+{"name": "rattata", "types": ["normal"], "stats": {"hp": 30, "attack": 56, "defense": 35, "special-attack": 25, "special-defense": 35, "speed": 72}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_190.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_190.json
index 0079167..c19f044 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_190.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_190.json
@@ -1,1 +1,1 @@
-{"name": "aipom", "types": ["normal"], "stats": {"speed": 85, "special-defense": 55, "special-attack": 40, "defense": 55, "attack": 70, "hp": 55}}
\ No newline at end of file
+{"name": "aipom", "types": ["normal"], "stats": {"hp": 55, "attack": 70, "defense": 55, "special-attack": 40, "special-defense": 55, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_191.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_191.json
index 8a873af..cb41805 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_191.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_191.json
@@ -1,1 +1,1 @@
-{"name": "sunkern", "types": ["grass"], "stats": {"speed": 30, "special-defense": 30, "special-attack": 30, "defense": 30, "attack": 30, "hp": 30}}
\ No newline at end of file
+{"name": "sunkern", "types": ["grass"], "stats": {"hp": 30, "attack": 30, "defense": 30, "special-attack": 30, "special-defense": 30, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_192.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_192.json
index 0069390..3ece080 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_192.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_192.json
@@ -1,1 +1,1 @@
-{"name": "sunflora", "types": ["grass"], "stats": {"speed": 30, "special-defense": 85, "special-attack": 105, "defense": 55, "attack": 75, "hp": 75}}
\ No newline at end of file
+{"name": "sunflora", "types": ["grass"], "stats": {"hp": 75, "attack": 75, "defense": 55, "special-attack": 105, "special-defense": 85, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_193.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_193.json
index 00c1da5..37044f2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_193.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_193.json
@@ -1,1 +1,1 @@
-{"name": "yanma", "types": ["flying", "bug"], "stats": {"speed": 95, "special-defense": 45, "special-attack": 75, "defense": 45, "attack": 65, "hp": 65}}
\ No newline at end of file
+{"name": "yanma", "types": ["bug", "flying"], "stats": {"hp": 65, "attack": 65, "defense": 45, "special-attack": 75, "special-defense": 45, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_194.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_194.json
index 5c9b9ba..f745eeb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_194.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_194.json
@@ -1,1 +1,1 @@
-{"name": "wooper", "types": ["ground", "water"], "stats": {"speed": 15, "special-defense": 25, "special-attack": 25, "defense": 45, "attack": 45, "hp": 55}}
\ No newline at end of file
+{"name": "wooper", "types": ["water", "ground"], "stats": {"hp": 55, "attack": 45, "defense": 45, "special-attack": 25, "special-defense": 25, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_195.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_195.json
index b161336..f88f826 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_195.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_195.json
@@ -1,1 +1,1 @@
-{"name": "quagsire", "types": ["ground", "water"], "stats": {"speed": 35, "special-defense": 65, "special-attack": 65, "defense": 85, "attack": 85, "hp": 95}}
\ No newline at end of file
+{"name": "quagsire", "types": ["water", "ground"], "stats": {"hp": 95, "attack": 85, "defense": 85, "special-attack": 65, "special-defense": 65, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_196.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_196.json
index 65f3f0c..406f85a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_196.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_196.json
@@ -1,1 +1,1 @@
-{"name": "espeon", "types": ["psychic"], "stats": {"speed": 110, "special-defense": 95, "special-attack": 130, "defense": 60, "attack": 65, "hp": 65}}
\ No newline at end of file
+{"name": "espeon", "types": ["psychic"], "stats": {"hp": 65, "attack": 65, "defense": 60, "special-attack": 130, "special-defense": 95, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_197.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_197.json
index 18a377e..c77c346 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_197.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_197.json
@@ -1,1 +1,1 @@
-{"name": "umbreon", "types": ["dark"], "stats": {"speed": 65, "special-defense": 130, "special-attack": 60, "defense": 110, "attack": 65, "hp": 95}}
\ No newline at end of file
+{"name": "umbreon", "types": ["dark"], "stats": {"hp": 95, "attack": 65, "defense": 110, "special-attack": 60, "special-defense": 130, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_198.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_198.json
index 09def55..b03c149 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_198.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_198.json
@@ -1,1 +1,1 @@
-{"name": "murkrow", "types": ["flying", "dark"], "stats": {"speed": 91, "special-defense": 42, "special-attack": 85, "defense": 42, "attack": 85, "hp": 60}}
\ No newline at end of file
+{"name": "murkrow", "types": ["dark", "flying"], "stats": {"hp": 60, "attack": 85, "defense": 42, "special-attack": 85, "special-defense": 42, "speed": 91}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_199.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_199.json
index 43147a7..35c2397 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_199.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_199.json
@@ -1,1 +1,1 @@
-{"name": "slowking", "types": ["psychic", "water"], "stats": {"speed": 30, "special-defense": 110, "special-attack": 100, "defense": 80, "attack": 75, "hp": 95}}
\ No newline at end of file
+{"name": "slowking", "types": ["water", "psychic"], "stats": {"hp": 95, "attack": 75, "defense": 80, "special-attack": 100, "special-defense": 110, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_2.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_2.json
index 31eb84e..74ba622 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_2.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_2.json
@@ -1,1 +1,1 @@
-{"name": "ivysaur", "types": ["poison", "grass"], "stats": {"speed": 60, "special-defense": 80, "special-attack": 80, "defense": 63, "attack": 62, "hp": 60}}
\ No newline at end of file
+{"name": "ivysaur", "types": ["grass", "poison"], "stats": {"hp": 60, "attack": 62, "defense": 63, "special-attack": 80, "special-defense": 80, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_20.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_20.json
index d06e9df..a16c058 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_20.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_20.json
@@ -1,1 +1,1 @@
-{"name": "raticate", "types": ["normal"], "stats": {"speed": 97, "special-defense": 70, "special-attack": 50, "defense": 60, "attack": 81, "hp": 55}}
\ No newline at end of file
+{"name": "raticate", "types": ["normal"], "stats": {"hp": 55, "attack": 81, "defense": 60, "special-attack": 50, "special-defense": 70, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_200.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_200.json
index ac8b055..5d9f068 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_200.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_200.json
@@ -1,1 +1,1 @@
-{"name": "misdreavus", "types": ["ghost"], "stats": {"speed": 85, "special-defense": 85, "special-attack": 85, "defense": 60, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "misdreavus", "types": ["ghost"], "stats": {"hp": 60, "attack": 60, "defense": 60, "special-attack": 85, "special-defense": 85, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_201.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_201.json
index f4d2b90..35cdcf5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_201.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_201.json
@@ -1,1 +1,1 @@
-{"name": "unown", "types": ["psychic"], "stats": {"speed": 48, "special-defense": 48, "special-attack": 72, "defense": 48, "attack": 72, "hp": 48}}
\ No newline at end of file
+{"name": "unown", "types": ["psychic"], "stats": {"hp": 48, "attack": 72, "defense": 48, "special-attack": 72, "special-defense": 48, "speed": 48}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_202.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_202.json
index c878073..7afb601 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_202.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_202.json
@@ -1,1 +1,1 @@
-{"name": "wobbuffet", "types": ["psychic"], "stats": {"speed": 33, "special-defense": 58, "special-attack": 33, "defense": 58, "attack": 33, "hp": 190}}
\ No newline at end of file
+{"name": "wobbuffet", "types": ["psychic"], "stats": {"hp": 190, "attack": 33, "defense": 58, "special-attack": 33, "special-defense": 58, "speed": 33}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_203.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_203.json
index 4d126e3..7ed36c4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_203.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_203.json
@@ -1,1 +1,1 @@
-{"name": "girafarig", "types": ["psychic", "normal"], "stats": {"speed": 85, "special-defense": 65, "special-attack": 90, "defense": 65, "attack": 80, "hp": 70}}
\ No newline at end of file
+{"name": "girafarig", "types": ["normal", "psychic"], "stats": {"hp": 70, "attack": 80, "defense": 65, "special-attack": 90, "special-defense": 65, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_204.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_204.json
index f52926a..38d18c6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_204.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_204.json
@@ -1,1 +1,1 @@
-{"name": "pineco", "types": ["bug"], "stats": {"speed": 15, "special-defense": 35, "special-attack": 35, "defense": 90, "attack": 65, "hp": 50}}
\ No newline at end of file
+{"name": "pineco", "types": ["bug"], "stats": {"hp": 50, "attack": 65, "defense": 90, "special-attack": 35, "special-defense": 35, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_205.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_205.json
index 3502553..2b8f4e9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_205.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_205.json
@@ -1,1 +1,1 @@
-{"name": "forretress", "types": ["steel", "bug"], "stats": {"speed": 40, "special-defense": 60, "special-attack": 60, "defense": 140, "attack": 90, "hp": 75}}
\ No newline at end of file
+{"name": "forretress", "types": ["bug", "steel"], "stats": {"hp": 75, "attack": 90, "defense": 140, "special-attack": 60, "special-defense": 60, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_206.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_206.json
index d7c3331..8689c56 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_206.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_206.json
@@ -1,1 +1,1 @@
-{"name": "dunsparce", "types": ["normal"], "stats": {"speed": 45, "special-defense": 65, "special-attack": 65, "defense": 70, "attack": 70, "hp": 100}}
\ No newline at end of file
+{"name": "dunsparce", "types": ["normal"], "stats": {"hp": 100, "attack": 70, "defense": 70, "special-attack": 65, "special-defense": 65, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_207.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_207.json
index 04c6e4e..fb8af13 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_207.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_207.json
@@ -1,1 +1,1 @@
-{"name": "gligar", "types": ["flying", "ground"], "stats": {"speed": 85, "special-defense": 65, "special-attack": 35, "defense": 105, "attack": 75, "hp": 65}}
\ No newline at end of file
+{"name": "gligar", "types": ["ground", "flying"], "stats": {"hp": 65, "attack": 75, "defense": 105, "special-attack": 35, "special-defense": 65, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_208.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_208.json
index b5ce4c2..9ed02e8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_208.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_208.json
@@ -1,1 +1,1 @@
-{"name": "steelix", "types": ["ground", "steel"], "stats": {"speed": 30, "special-defense": 65, "special-attack": 55, "defense": 200, "attack": 85, "hp": 75}}
\ No newline at end of file
+{"name": "steelix", "types": ["steel", "ground"], "stats": {"hp": 75, "attack": 85, "defense": 200, "special-attack": 55, "special-defense": 65, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_209.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_209.json
index ff8cdb9..c5a2eb7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_209.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_209.json
@@ -1,1 +1,1 @@
-{"name": "snubbull", "types": ["fairy"], "stats": {"speed": 30, "special-defense": 40, "special-attack": 40, "defense": 50, "attack": 80, "hp": 60}}
\ No newline at end of file
+{"name": "snubbull", "types": ["fairy"], "stats": {"hp": 60, "attack": 80, "defense": 50, "special-attack": 40, "special-defense": 40, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_21.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_21.json
index 17f2f5b..a5059ad 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_21.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_21.json
@@ -1,1 +1,1 @@
-{"name": "spearow", "types": ["flying", "normal"], "stats": {"speed": 70, "special-defense": 31, "special-attack": 31, "defense": 30, "attack": 60, "hp": 40}}
\ No newline at end of file
+{"name": "spearow", "types": ["normal", "flying"], "stats": {"hp": 40, "attack": 60, "defense": 30, "special-attack": 31, "special-defense": 31, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_210.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_210.json
index fae3be8..da3bf51 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_210.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_210.json
@@ -1,1 +1,1 @@
-{"name": "granbull", "types": ["fairy"], "stats": {"speed": 45, "special-defense": 60, "special-attack": 60, "defense": 75, "attack": 120, "hp": 90}}
\ No newline at end of file
+{"name": "granbull", "types": ["fairy"], "stats": {"hp": 90, "attack": 120, "defense": 75, "special-attack": 60, "special-defense": 60, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_211.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_211.json
index 3b367b6..0abf1a9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_211.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_211.json
@@ -1,1 +1,1 @@
-{"name": "qwilfish", "types": ["poison", "water"], "stats": {"speed": 85, "special-defense": 55, "special-attack": 55, "defense": 85, "attack": 95, "hp": 65}}
\ No newline at end of file
+{"name": "qwilfish", "types": ["water", "poison"], "stats": {"hp": 65, "attack": 95, "defense": 85, "special-attack": 55, "special-defense": 55, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_212.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_212.json
index 4185f7e..fe5422d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_212.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_212.json
@@ -1,1 +1,1 @@
-{"name": "scizor", "types": ["steel", "bug"], "stats": {"speed": 65, "special-defense": 80, "special-attack": 55, "defense": 100, "attack": 130, "hp": 70}}
\ No newline at end of file
+{"name": "scizor", "types": ["bug", "steel"], "stats": {"hp": 70, "attack": 130, "defense": 100, "special-attack": 55, "special-defense": 80, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_213.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_213.json
index 6b46e48..a631ce1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_213.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_213.json
@@ -1,1 +1,1 @@
-{"name": "shuckle", "types": ["rock", "bug"], "stats": {"speed": 5, "special-defense": 230, "special-attack": 10, "defense": 230, "attack": 10, "hp": 20}}
\ No newline at end of file
+{"name": "shuckle", "types": ["bug", "rock"], "stats": {"hp": 20, "attack": 10, "defense": 230, "special-attack": 10, "special-defense": 230, "speed": 5}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_214.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_214.json
index f83e1b2..34c2edb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_214.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_214.json
@@ -1,1 +1,1 @@
-{"name": "heracross", "types": ["fighting", "bug"], "stats": {"speed": 85, "special-defense": 95, "special-attack": 40, "defense": 75, "attack": 125, "hp": 80}}
\ No newline at end of file
+{"name": "heracross", "types": ["bug", "fighting"], "stats": {"hp": 80, "attack": 125, "defense": 75, "special-attack": 40, "special-defense": 95, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_215.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_215.json
index b689947..95f66a0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_215.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_215.json
@@ -1,1 +1,1 @@
-{"name": "sneasel", "types": ["ice", "dark"], "stats": {"speed": 115, "special-defense": 75, "special-attack": 35, "defense": 55, "attack": 95, "hp": 55}}
\ No newline at end of file
+{"name": "sneasel", "types": ["dark", "ice"], "stats": {"hp": 55, "attack": 95, "defense": 55, "special-attack": 35, "special-defense": 75, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_216.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_216.json
index 28a0098..2e8c9ca 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_216.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_216.json
@@ -1,1 +1,1 @@
-{"name": "teddiursa", "types": ["normal"], "stats": {"speed": 40, "special-defense": 50, "special-attack": 50, "defense": 50, "attack": 80, "hp": 60}}
\ No newline at end of file
+{"name": "teddiursa", "types": ["normal"], "stats": {"hp": 60, "attack": 80, "defense": 50, "special-attack": 50, "special-defense": 50, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_217.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_217.json
index e746620..10b3255 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_217.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_217.json
@@ -1,1 +1,1 @@
-{"name": "ursaring", "types": ["normal"], "stats": {"speed": 55, "special-defense": 75, "special-attack": 75, "defense": 75, "attack": 130, "hp": 90}}
\ No newline at end of file
+{"name": "ursaring", "types": ["normal"], "stats": {"hp": 90, "attack": 130, "defense": 75, "special-attack": 75, "special-defense": 75, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_218.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_218.json
index f056b6b..6d58a70 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_218.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_218.json
@@ -1,1 +1,1 @@
-{"name": "slugma", "types": ["fire"], "stats": {"speed": 20, "special-defense": 40, "special-attack": 70, "defense": 40, "attack": 40, "hp": 40}}
\ No newline at end of file
+{"name": "slugma", "types": ["fire"], "stats": {"hp": 40, "attack": 40, "defense": 40, "special-attack": 70, "special-defense": 40, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_219.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_219.json
index 17d1c9e..c8ad637 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_219.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_219.json
@@ -1,1 +1,1 @@
-{"name": "magcargo", "types": ["rock", "fire"], "stats": {"speed": 30, "special-defense": 80, "special-attack": 90, "defense": 120, "attack": 50, "hp": 60}}
\ No newline at end of file
+{"name": "magcargo", "types": ["fire", "rock"], "stats": {"hp": 60, "attack": 50, "defense": 120, "special-attack": 90, "special-defense": 80, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_22.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_22.json
index 6d8e7cf..8dcda74 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_22.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_22.json
@@ -1,1 +1,1 @@
-{"name": "fearow", "types": ["flying", "normal"], "stats": {"speed": 100, "special-defense": 61, "special-attack": 61, "defense": 65, "attack": 90, "hp": 65}}
\ No newline at end of file
+{"name": "fearow", "types": ["normal", "flying"], "stats": {"hp": 65, "attack": 90, "defense": 65, "special-attack": 61, "special-defense": 61, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_220.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_220.json
index d6be69d..56674e9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_220.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_220.json
@@ -1,1 +1,1 @@
-{"name": "swinub", "types": ["ground", "ice"], "stats": {"speed": 50, "special-defense": 30, "special-attack": 30, "defense": 40, "attack": 50, "hp": 50}}
\ No newline at end of file
+{"name": "swinub", "types": ["ice", "ground"], "stats": {"hp": 50, "attack": 50, "defense": 40, "special-attack": 30, "special-defense": 30, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_221.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_221.json
index 2f42438..dca4343 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_221.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_221.json
@@ -1,1 +1,1 @@
-{"name": "piloswine", "types": ["ground", "ice"], "stats": {"speed": 50, "special-defense": 60, "special-attack": 60, "defense": 80, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "piloswine", "types": ["ice", "ground"], "stats": {"hp": 100, "attack": 100, "defense": 80, "special-attack": 60, "special-defense": 60, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_222.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_222.json
index 98b6ec7..73ab546 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_222.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_222.json
@@ -1,1 +1,1 @@
-{"name": "corsola", "types": ["rock", "water"], "stats": {"speed": 35, "special-defense": 95, "special-attack": 65, "defense": 95, "attack": 55, "hp": 65}}
\ No newline at end of file
+{"name": "corsola", "types": ["water", "rock"], "stats": {"hp": 65, "attack": 55, "defense": 95, "special-attack": 65, "special-defense": 95, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_223.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_223.json
index d0f63fd..892239d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_223.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_223.json
@@ -1,1 +1,1 @@
-{"name": "remoraid", "types": ["water"], "stats": {"speed": 65, "special-defense": 35, "special-attack": 65, "defense": 35, "attack": 65, "hp": 35}}
\ No newline at end of file
+{"name": "remoraid", "types": ["water"], "stats": {"hp": 35, "attack": 65, "defense": 35, "special-attack": 65, "special-defense": 35, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_224.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_224.json
index 4f10649..4d51967 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_224.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_224.json
@@ -1,1 +1,1 @@
-{"name": "octillery", "types": ["water"], "stats": {"speed": 45, "special-defense": 75, "special-attack": 105, "defense": 75, "attack": 105, "hp": 75}}
\ No newline at end of file
+{"name": "octillery", "types": ["water"], "stats": {"hp": 75, "attack": 105, "defense": 75, "special-attack": 105, "special-defense": 75, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_225.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_225.json
index f8d5939..4c7aa54 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_225.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_225.json
@@ -1,1 +1,1 @@
-{"name": "delibird", "types": ["flying", "ice"], "stats": {"speed": 75, "special-defense": 45, "special-attack": 65, "defense": 45, "attack": 55, "hp": 45}}
\ No newline at end of file
+{"name": "delibird", "types": ["ice", "flying"], "stats": {"hp": 45, "attack": 55, "defense": 45, "special-attack": 65, "special-defense": 45, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_226.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_226.json
index 71f49fe..8370bae 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_226.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_226.json
@@ -1,1 +1,1 @@
-{"name": "mantine", "types": ["flying", "water"], "stats": {"speed": 70, "special-defense": 140, "special-attack": 80, "defense": 70, "attack": 40, "hp": 85}}
\ No newline at end of file
+{"name": "mantine", "types": ["water", "flying"], "stats": {"hp": 85, "attack": 40, "defense": 70, "special-attack": 80, "special-defense": 140, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_227.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_227.json
index 1874db4..ee4914d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_227.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_227.json
@@ -1,1 +1,1 @@
-{"name": "skarmory", "types": ["flying", "steel"], "stats": {"speed": 70, "special-defense": 70, "special-attack": 40, "defense": 140, "attack": 80, "hp": 65}}
\ No newline at end of file
+{"name": "skarmory", "types": ["steel", "flying"], "stats": {"hp": 65, "attack": 80, "defense": 140, "special-attack": 40, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_228.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_228.json
index 4eb7172..edc6350 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_228.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_228.json
@@ -1,1 +1,1 @@
-{"name": "houndour", "types": ["fire", "dark"], "stats": {"speed": 65, "special-defense": 50, "special-attack": 80, "defense": 30, "attack": 60, "hp": 45}}
\ No newline at end of file
+{"name": "houndour", "types": ["dark", "fire"], "stats": {"hp": 45, "attack": 60, "defense": 30, "special-attack": 80, "special-defense": 50, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_229.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_229.json
index 78b9fb2..3971f7a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_229.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_229.json
@@ -1,1 +1,1 @@
-{"name": "houndoom", "types": ["fire", "dark"], "stats": {"speed": 95, "special-defense": 80, "special-attack": 110, "defense": 50, "attack": 90, "hp": 75}}
\ No newline at end of file
+{"name": "houndoom", "types": ["dark", "fire"], "stats": {"hp": 75, "attack": 90, "defense": 50, "special-attack": 110, "special-defense": 80, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_23.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_23.json
index ffe7166..d3edd07 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_23.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_23.json
@@ -1,1 +1,1 @@
-{"name": "ekans", "types": ["poison"], "stats": {"speed": 55, "special-defense": 54, "special-attack": 40, "defense": 44, "attack": 60, "hp": 35}}
\ No newline at end of file
+{"name": "ekans", "types": ["poison"], "stats": {"hp": 35, "attack": 60, "defense": 44, "special-attack": 40, "special-defense": 54, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_230.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_230.json
index e07dd37..85f39bd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_230.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_230.json
@@ -1,1 +1,1 @@
-{"name": "kingdra", "types": ["dragon", "water"], "stats": {"speed": 85, "special-defense": 95, "special-attack": 95, "defense": 95, "attack": 95, "hp": 75}}
\ No newline at end of file
+{"name": "kingdra", "types": ["water", "dragon"], "stats": {"hp": 75, "attack": 95, "defense": 95, "special-attack": 95, "special-defense": 95, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_231.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_231.json
index 570a587..8b62758 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_231.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_231.json
@@ -1,1 +1,1 @@
-{"name": "phanpy", "types": ["ground"], "stats": {"speed": 40, "special-defense": 40, "special-attack": 40, "defense": 60, "attack": 60, "hp": 90}}
\ No newline at end of file
+{"name": "phanpy", "types": ["ground"], "stats": {"hp": 90, "attack": 60, "defense": 60, "special-attack": 40, "special-defense": 40, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_232.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_232.json
index eb2e13e..21b80ba 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_232.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_232.json
@@ -1,1 +1,1 @@
-{"name": "donphan", "types": ["ground"], "stats": {"speed": 50, "special-defense": 60, "special-attack": 60, "defense": 120, "attack": 120, "hp": 90}}
\ No newline at end of file
+{"name": "donphan", "types": ["ground"], "stats": {"hp": 90, "attack": 120, "defense": 120, "special-attack": 60, "special-defense": 60, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_233.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_233.json
index a12a8dc..1e8a893 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_233.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_233.json
@@ -1,1 +1,1 @@
-{"name": "porygon2", "types": ["normal"], "stats": {"speed": 60, "special-defense": 95, "special-attack": 105, "defense": 90, "attack": 80, "hp": 85}}
\ No newline at end of file
+{"name": "porygon2", "types": ["normal"], "stats": {"hp": 85, "attack": 80, "defense": 90, "special-attack": 105, "special-defense": 95, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_234.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_234.json
index 18dcde9..d875756 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_234.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_234.json
@@ -1,1 +1,1 @@
-{"name": "stantler", "types": ["normal"], "stats": {"speed": 85, "special-defense": 65, "special-attack": 85, "defense": 62, "attack": 95, "hp": 73}}
\ No newline at end of file
+{"name": "stantler", "types": ["normal"], "stats": {"hp": 73, "attack": 95, "defense": 62, "special-attack": 85, "special-defense": 65, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_235.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_235.json
index 7037743..b29f6d9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_235.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_235.json
@@ -1,1 +1,1 @@
-{"name": "smeargle", "types": ["normal"], "stats": {"speed": 75, "special-defense": 45, "special-attack": 20, "defense": 35, "attack": 20, "hp": 55}}
\ No newline at end of file
+{"name": "smeargle", "types": ["normal"], "stats": {"hp": 55, "attack": 20, "defense": 35, "special-attack": 20, "special-defense": 45, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_236.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_236.json
index 9cca01e..149a29c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_236.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_236.json
@@ -1,1 +1,1 @@
-{"name": "tyrogue", "types": ["fighting"], "stats": {"speed": 35, "special-defense": 35, "special-attack": 35, "defense": 35, "attack": 35, "hp": 35}}
\ No newline at end of file
+{"name": "tyrogue", "types": ["fighting"], "stats": {"hp": 35, "attack": 35, "defense": 35, "special-attack": 35, "special-defense": 35, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_237.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_237.json
index c693322..d73a31c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_237.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_237.json
@@ -1,1 +1,1 @@
-{"name": "hitmontop", "types": ["fighting"], "stats": {"speed": 70, "special-defense": 110, "special-attack": 35, "defense": 95, "attack": 95, "hp": 50}}
\ No newline at end of file
+{"name": "hitmontop", "types": ["fighting"], "stats": {"hp": 50, "attack": 95, "defense": 95, "special-attack": 35, "special-defense": 110, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_238.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_238.json
index fcb21c1..5c8072e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_238.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_238.json
@@ -1,1 +1,1 @@
-{"name": "smoochum", "types": ["psychic", "ice"], "stats": {"speed": 65, "special-defense": 65, "special-attack": 85, "defense": 15, "attack": 30, "hp": 45}}
\ No newline at end of file
+{"name": "smoochum", "types": ["ice", "psychic"], "stats": {"hp": 45, "attack": 30, "defense": 15, "special-attack": 85, "special-defense": 65, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_239.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_239.json
index a9f3255..fb6e5c4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_239.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_239.json
@@ -1,1 +1,1 @@
-{"name": "elekid", "types": ["electric"], "stats": {"speed": 95, "special-defense": 55, "special-attack": 65, "defense": 37, "attack": 63, "hp": 45}}
\ No newline at end of file
+{"name": "elekid", "types": ["electric"], "stats": {"hp": 45, "attack": 63, "defense": 37, "special-attack": 65, "special-defense": 55, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_24.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_24.json
index a07eec7..466c9a6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_24.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_24.json
@@ -1,1 +1,1 @@
-{"name": "arbok", "types": ["poison"], "stats": {"speed": 80, "special-defense": 79, "special-attack": 65, "defense": 69, "attack": 95, "hp": 60}}
\ No newline at end of file
+{"name": "arbok", "types": ["poison"], "stats": {"hp": 60, "attack": 95, "defense": 69, "special-attack": 65, "special-defense": 79, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_240.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_240.json
index 3fed6de..3aa20e7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_240.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_240.json
@@ -1,1 +1,1 @@
-{"name": "magby", "types": ["fire"], "stats": {"speed": 83, "special-defense": 55, "special-attack": 70, "defense": 37, "attack": 75, "hp": 45}}
\ No newline at end of file
+{"name": "magby", "types": ["fire"], "stats": {"hp": 45, "attack": 75, "defense": 37, "special-attack": 70, "special-defense": 55, "speed": 83}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_241.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_241.json
index 66658ba..d1ef3d5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_241.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_241.json
@@ -1,1 +1,1 @@
-{"name": "miltank", "types": ["normal"], "stats": {"speed": 100, "special-defense": 70, "special-attack": 40, "defense": 105, "attack": 80, "hp": 95}}
\ No newline at end of file
+{"name": "miltank", "types": ["normal"], "stats": {"hp": 95, "attack": 80, "defense": 105, "special-attack": 40, "special-defense": 70, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_242.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_242.json
index a3a7092..6715e34 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_242.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_242.json
@@ -1,1 +1,1 @@
-{"name": "blissey", "types": ["normal"], "stats": {"speed": 55, "special-defense": 135, "special-attack": 75, "defense": 10, "attack": 10, "hp": 255}}
\ No newline at end of file
+{"name": "blissey", "types": ["normal"], "stats": {"hp": 255, "attack": 10, "defense": 10, "special-attack": 75, "special-defense": 135, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_243.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_243.json
index b347f1a..f197904 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_243.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_243.json
@@ -1,1 +1,1 @@
-{"name": "raikou", "types": ["electric"], "stats": {"speed": 115, "special-defense": 100, "special-attack": 115, "defense": 75, "attack": 85, "hp": 90}}
\ No newline at end of file
+{"name": "raikou", "types": ["electric"], "stats": {"hp": 90, "attack": 85, "defense": 75, "special-attack": 115, "special-defense": 100, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_244.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_244.json
index eae7fb5..660b1e5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_244.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_244.json
@@ -1,1 +1,1 @@
-{"name": "entei", "types": ["fire"], "stats": {"speed": 100, "special-defense": 75, "special-attack": 90, "defense": 85, "attack": 115, "hp": 115}}
\ No newline at end of file
+{"name": "entei", "types": ["fire"], "stats": {"hp": 115, "attack": 115, "defense": 85, "special-attack": 90, "special-defense": 75, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_245.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_245.json
index 368df1a..5530e49 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_245.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_245.json
@@ -1,1 +1,1 @@
-{"name": "suicune", "types": ["water"], "stats": {"speed": 85, "special-defense": 115, "special-attack": 90, "defense": 115, "attack": 75, "hp": 100}}
\ No newline at end of file
+{"name": "suicune", "types": ["water"], "stats": {"hp": 100, "attack": 75, "defense": 115, "special-attack": 90, "special-defense": 115, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_246.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_246.json
index e04c380..8b08a28 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_246.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_246.json
@@ -1,1 +1,1 @@
-{"name": "larvitar", "types": ["ground", "rock"], "stats": {"speed": 41, "special-defense": 50, "special-attack": 45, "defense": 50, "attack": 64, "hp": 50}}
\ No newline at end of file
+{"name": "larvitar", "types": ["rock", "ground"], "stats": {"hp": 50, "attack": 64, "defense": 50, "special-attack": 45, "special-defense": 50, "speed": 41}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_247.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_247.json
index a77d0cd..f7466f4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_247.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_247.json
@@ -1,1 +1,1 @@
-{"name": "pupitar", "types": ["ground", "rock"], "stats": {"speed": 51, "special-defense": 70, "special-attack": 65, "defense": 70, "attack": 84, "hp": 70}}
\ No newline at end of file
+{"name": "pupitar", "types": ["rock", "ground"], "stats": {"hp": 70, "attack": 84, "defense": 70, "special-attack": 65, "special-defense": 70, "speed": 51}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_248.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_248.json
index 761c677..deb5a39 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_248.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_248.json
@@ -1,1 +1,1 @@
-{"name": "tyranitar", "types": ["dark", "rock"], "stats": {"speed": 61, "special-defense": 100, "special-attack": 95, "defense": 110, "attack": 134, "hp": 100}}
\ No newline at end of file
+{"name": "tyranitar", "types": ["rock", "dark"], "stats": {"hp": 100, "attack": 134, "defense": 110, "special-attack": 95, "special-defense": 100, "speed": 61}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_249.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_249.json
index 7824c8f..9ffdb4f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_249.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_249.json
@@ -1,1 +1,1 @@
-{"name": "lugia", "types": ["flying", "psychic"], "stats": {"speed": 110, "special-defense": 154, "special-attack": 90, "defense": 130, "attack": 90, "hp": 106}}
\ No newline at end of file
+{"name": "lugia", "types": ["psychic", "flying"], "stats": {"hp": 106, "attack": 90, "defense": 130, "special-attack": 90, "special-defense": 154, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_25.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_25.json
index 832265c..1df03f1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_25.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_25.json
@@ -1,1 +1,1 @@
-{"name": "pikachu", "types": ["electric"], "stats": {"speed": 90, "special-defense": 50, "special-attack": 50, "defense": 40, "attack": 55, "hp": 35}}
\ No newline at end of file
+{"name": "pikachu", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_250.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_250.json
index 828fe57..68aba38 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_250.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_250.json
@@ -1,1 +1,1 @@
-{"name": "ho-oh", "types": ["flying", "fire"], "stats": {"speed": 90, "special-defense": 154, "special-attack": 110, "defense": 90, "attack": 130, "hp": 106}}
\ No newline at end of file
+{"name": "ho-oh", "types": ["fire", "flying"], "stats": {"hp": 106, "attack": 130, "defense": 90, "special-attack": 110, "special-defense": 154, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_251.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_251.json
index fedf020..c07ace3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_251.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_251.json
@@ -1,1 +1,1 @@
-{"name": "celebi", "types": ["grass", "psychic"], "stats": {"speed": 100, "special-defense": 100, "special-attack": 100, "defense": 100, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "celebi", "types": ["psychic", "grass"], "stats": {"hp": 100, "attack": 100, "defense": 100, "special-attack": 100, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_252.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_252.json
index 4f10ab6..c5c26f7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_252.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_252.json
@@ -1,1 +1,1 @@
-{"name": "treecko", "types": ["grass"], "stats": {"speed": 70, "special-defense": 55, "special-attack": 65, "defense": 35, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "treecko", "types": ["grass"], "stats": {"hp": 40, "attack": 45, "defense": 35, "special-attack": 65, "special-defense": 55, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_253.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_253.json
index 386463d..a334f9d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_253.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_253.json
@@ -1,1 +1,1 @@
-{"name": "grovyle", "types": ["grass"], "stats": {"speed": 95, "special-defense": 65, "special-attack": 85, "defense": 45, "attack": 65, "hp": 50}}
\ No newline at end of file
+{"name": "grovyle", "types": ["grass"], "stats": {"hp": 50, "attack": 65, "defense": 45, "special-attack": 85, "special-defense": 65, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_254.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_254.json
index f665dcb..f7a4312 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_254.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_254.json
@@ -1,1 +1,1 @@
-{"name": "sceptile", "types": ["grass"], "stats": {"speed": 120, "special-defense": 85, "special-attack": 105, "defense": 65, "attack": 85, "hp": 70}}
\ No newline at end of file
+{"name": "sceptile", "types": ["grass"], "stats": {"hp": 70, "attack": 85, "defense": 65, "special-attack": 105, "special-defense": 85, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_255.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_255.json
index 34dd169..dbf30dd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_255.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_255.json
@@ -1,1 +1,1 @@
-{"name": "torchic", "types": ["fire"], "stats": {"speed": 45, "special-defense": 50, "special-attack": 70, "defense": 40, "attack": 60, "hp": 45}}
\ No newline at end of file
+{"name": "torchic", "types": ["fire"], "stats": {"hp": 45, "attack": 60, "defense": 40, "special-attack": 70, "special-defense": 50, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_256.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_256.json
index 87d0853..2e19809 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_256.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_256.json
@@ -1,1 +1,1 @@
-{"name": "combusken", "types": ["fighting", "fire"], "stats": {"speed": 55, "special-defense": 60, "special-attack": 85, "defense": 60, "attack": 85, "hp": 60}}
\ No newline at end of file
+{"name": "combusken", "types": ["fire", "fighting"], "stats": {"hp": 60, "attack": 85, "defense": 60, "special-attack": 85, "special-defense": 60, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_257.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_257.json
index 417d188..aba627f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_257.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_257.json
@@ -1,1 +1,1 @@
-{"name": "blaziken", "types": ["fighting", "fire"], "stats": {"speed": 80, "special-defense": 70, "special-attack": 110, "defense": 70, "attack": 120, "hp": 80}}
\ No newline at end of file
+{"name": "blaziken", "types": ["fire", "fighting"], "stats": {"hp": 80, "attack": 120, "defense": 70, "special-attack": 110, "special-defense": 70, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_258.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_258.json
index 03ec678..f2c5ca9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_258.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_258.json
@@ -1,1 +1,1 @@
-{"name": "mudkip", "types": ["water"], "stats": {"speed": 40, "special-defense": 50, "special-attack": 50, "defense": 50, "attack": 70, "hp": 50}}
\ No newline at end of file
+{"name": "mudkip", "types": ["water"], "stats": {"hp": 50, "attack": 70, "defense": 50, "special-attack": 50, "special-defense": 50, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_259.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_259.json
index c9ca793..ce1fd5a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_259.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_259.json
@@ -1,1 +1,1 @@
-{"name": "marshtomp", "types": ["ground", "water"], "stats": {"speed": 50, "special-defense": 70, "special-attack": 60, "defense": 70, "attack": 85, "hp": 70}}
\ No newline at end of file
+{"name": "marshtomp", "types": ["water", "ground"], "stats": {"hp": 70, "attack": 85, "defense": 70, "special-attack": 60, "special-defense": 70, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_26.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_26.json
index b21f32b..bbd41da 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_26.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_26.json
@@ -1,1 +1,1 @@
-{"name": "raichu", "types": ["electric"], "stats": {"speed": 110, "special-defense": 80, "special-attack": 90, "defense": 55, "attack": 90, "hp": 60}}
\ No newline at end of file
+{"name": "raichu", "types": ["electric"], "stats": {"hp": 60, "attack": 90, "defense": 55, "special-attack": 90, "special-defense": 80, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_260.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_260.json
index eda3a0d..465d62a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_260.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_260.json
@@ -1,1 +1,1 @@
-{"name": "swampert", "types": ["ground", "water"], "stats": {"speed": 60, "special-defense": 90, "special-attack": 85, "defense": 90, "attack": 110, "hp": 100}}
\ No newline at end of file
+{"name": "swampert", "types": ["water", "ground"], "stats": {"hp": 100, "attack": 110, "defense": 90, "special-attack": 85, "special-defense": 90, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_261.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_261.json
index 7905af3..37caec4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_261.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_261.json
@@ -1,1 +1,1 @@
-{"name": "poochyena", "types": ["dark"], "stats": {"speed": 35, "special-defense": 30, "special-attack": 30, "defense": 35, "attack": 55, "hp": 35}}
\ No newline at end of file
+{"name": "poochyena", "types": ["dark"], "stats": {"hp": 35, "attack": 55, "defense": 35, "special-attack": 30, "special-defense": 30, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_262.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_262.json
index b9c71b3..c5f1e45 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_262.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_262.json
@@ -1,1 +1,1 @@
-{"name": "mightyena", "types": ["dark"], "stats": {"speed": 70, "special-defense": 60, "special-attack": 60, "defense": 70, "attack": 90, "hp": 70}}
\ No newline at end of file
+{"name": "mightyena", "types": ["dark"], "stats": {"hp": 70, "attack": 90, "defense": 70, "special-attack": 60, "special-defense": 60, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_263.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_263.json
index 1ad5a0b..06f99bd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_263.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_263.json
@@ -1,1 +1,1 @@
-{"name": "zigzagoon", "types": ["normal"], "stats": {"speed": 60, "special-defense": 41, "special-attack": 30, "defense": 41, "attack": 30, "hp": 38}}
\ No newline at end of file
+{"name": "zigzagoon", "types": ["normal"], "stats": {"hp": 38, "attack": 30, "defense": 41, "special-attack": 30, "special-defense": 41, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_264.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_264.json
index c795d38..195465e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_264.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_264.json
@@ -1,1 +1,1 @@
-{"name": "linoone", "types": ["normal"], "stats": {"speed": 100, "special-defense": 61, "special-attack": 50, "defense": 61, "attack": 70, "hp": 78}}
\ No newline at end of file
+{"name": "linoone", "types": ["normal"], "stats": {"hp": 78, "attack": 70, "defense": 61, "special-attack": 50, "special-defense": 61, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_265.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_265.json
index e45a80d..58158f5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_265.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_265.json
@@ -1,1 +1,1 @@
-{"name": "wurmple", "types": ["bug"], "stats": {"speed": 20, "special-defense": 30, "special-attack": 20, "defense": 35, "attack": 45, "hp": 45}}
\ No newline at end of file
+{"name": "wurmple", "types": ["bug"], "stats": {"hp": 45, "attack": 45, "defense": 35, "special-attack": 20, "special-defense": 30, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_266.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_266.json
index b31e4da..240843f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_266.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_266.json
@@ -1,1 +1,1 @@
-{"name": "silcoon", "types": ["bug"], "stats": {"speed": 15, "special-defense": 25, "special-attack": 25, "defense": 55, "attack": 35, "hp": 50}}
\ No newline at end of file
+{"name": "silcoon", "types": ["bug"], "stats": {"hp": 50, "attack": 35, "defense": 55, "special-attack": 25, "special-defense": 25, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_267.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_267.json
index d75c77e..a892a1a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_267.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_267.json
@@ -1,1 +1,1 @@
-{"name": "beautifly", "types": ["flying", "bug"], "stats": {"speed": 65, "special-defense": 50, "special-attack": 100, "defense": 50, "attack": 70, "hp": 60}}
\ No newline at end of file
+{"name": "beautifly", "types": ["bug", "flying"], "stats": {"hp": 60, "attack": 70, "defense": 50, "special-attack": 100, "special-defense": 50, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_268.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_268.json
index 316e889..5da940c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_268.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_268.json
@@ -1,1 +1,1 @@
-{"name": "cascoon", "types": ["bug"], "stats": {"speed": 15, "special-defense": 25, "special-attack": 25, "defense": 55, "attack": 35, "hp": 50}}
\ No newline at end of file
+{"name": "cascoon", "types": ["bug"], "stats": {"hp": 50, "attack": 35, "defense": 55, "special-attack": 25, "special-defense": 25, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_269.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_269.json
index 737f542..2ac1c74 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_269.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_269.json
@@ -1,1 +1,1 @@
-{"name": "dustox", "types": ["poison", "bug"], "stats": {"speed": 65, "special-defense": 90, "special-attack": 50, "defense": 70, "attack": 50, "hp": 60}}
\ No newline at end of file
+{"name": "dustox", "types": ["bug", "poison"], "stats": {"hp": 60, "attack": 50, "defense": 70, "special-attack": 50, "special-defense": 90, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_27.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_27.json
index d79d567..459852d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_27.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_27.json
@@ -1,1 +1,1 @@
-{"name": "sandshrew", "types": ["ground"], "stats": {"speed": 40, "special-defense": 30, "special-attack": 20, "defense": 85, "attack": 75, "hp": 50}}
\ No newline at end of file
+{"name": "sandshrew", "types": ["ground"], "stats": {"hp": 50, "attack": 75, "defense": 85, "special-attack": 20, "special-defense": 30, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_270.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_270.json
index 27af536..a4e2e55 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_270.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_270.json
@@ -1,1 +1,1 @@
-{"name": "lotad", "types": ["grass", "water"], "stats": {"speed": 30, "special-defense": 50, "special-attack": 40, "defense": 30, "attack": 30, "hp": 40}}
\ No newline at end of file
+{"name": "lotad", "types": ["water", "grass"], "stats": {"hp": 40, "attack": 30, "defense": 30, "special-attack": 40, "special-defense": 50, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_271.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_271.json
index 6e09894..91a5912 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_271.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_271.json
@@ -1,1 +1,1 @@
-{"name": "lombre", "types": ["grass", "water"], "stats": {"speed": 50, "special-defense": 70, "special-attack": 60, "defense": 50, "attack": 50, "hp": 60}}
\ No newline at end of file
+{"name": "lombre", "types": ["water", "grass"], "stats": {"hp": 60, "attack": 50, "defense": 50, "special-attack": 60, "special-defense": 70, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_272.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_272.json
index e6e1374..d3e0a1a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_272.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_272.json
@@ -1,1 +1,1 @@
-{"name": "ludicolo", "types": ["grass", "water"], "stats": {"speed": 70, "special-defense": 100, "special-attack": 90, "defense": 70, "attack": 70, "hp": 80}}
\ No newline at end of file
+{"name": "ludicolo", "types": ["water", "grass"], "stats": {"hp": 80, "attack": 70, "defense": 70, "special-attack": 90, "special-defense": 100, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_273.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_273.json
index 9f5026b..bed1ef5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_273.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_273.json
@@ -1,1 +1,1 @@
-{"name": "seedot", "types": ["grass"], "stats": {"speed": 30, "special-defense": 30, "special-attack": 30, "defense": 50, "attack": 40, "hp": 40}}
\ No newline at end of file
+{"name": "seedot", "types": ["grass"], "stats": {"hp": 40, "attack": 40, "defense": 50, "special-attack": 30, "special-defense": 30, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_274.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_274.json
index 7033a0a..d62471f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_274.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_274.json
@@ -1,1 +1,1 @@
-{"name": "nuzleaf", "types": ["dark", "grass"], "stats": {"speed": 60, "special-defense": 40, "special-attack": 60, "defense": 40, "attack": 70, "hp": 70}}
\ No newline at end of file
+{"name": "nuzleaf", "types": ["grass", "dark"], "stats": {"hp": 70, "attack": 70, "defense": 40, "special-attack": 60, "special-defense": 40, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_275.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_275.json
index 3650463..8551663 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_275.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_275.json
@@ -1,1 +1,1 @@
-{"name": "shiftry", "types": ["dark", "grass"], "stats": {"speed": 80, "special-defense": 60, "special-attack": 90, "defense": 60, "attack": 100, "hp": 90}}
\ No newline at end of file
+{"name": "shiftry", "types": ["grass", "dark"], "stats": {"hp": 90, "attack": 100, "defense": 60, "special-attack": 90, "special-defense": 60, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_276.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_276.json
index afa7bb6..737598c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_276.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_276.json
@@ -1,1 +1,1 @@
-{"name": "taillow", "types": ["flying", "normal"], "stats": {"speed": 85, "special-defense": 30, "special-attack": 30, "defense": 30, "attack": 55, "hp": 40}}
\ No newline at end of file
+{"name": "taillow", "types": ["normal", "flying"], "stats": {"hp": 40, "attack": 55, "defense": 30, "special-attack": 30, "special-defense": 30, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_277.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_277.json
index 9b76cfc..e51baad 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_277.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_277.json
@@ -1,1 +1,1 @@
-{"name": "swellow", "types": ["flying", "normal"], "stats": {"speed": 125, "special-defense": 50, "special-attack": 75, "defense": 60, "attack": 85, "hp": 60}}
\ No newline at end of file
+{"name": "swellow", "types": ["normal", "flying"], "stats": {"hp": 60, "attack": 85, "defense": 60, "special-attack": 75, "special-defense": 50, "speed": 125}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_278.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_278.json
index c824c34..86d01c8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_278.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_278.json
@@ -1,1 +1,1 @@
-{"name": "wingull", "types": ["flying", "water"], "stats": {"speed": 85, "special-defense": 30, "special-attack": 55, "defense": 30, "attack": 30, "hp": 40}}
\ No newline at end of file
+{"name": "wingull", "types": ["water", "flying"], "stats": {"hp": 40, "attack": 30, "defense": 30, "special-attack": 55, "special-defense": 30, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_279.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_279.json
index 5b65d9a..4bb59c9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_279.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_279.json
@@ -1,1 +1,1 @@
-{"name": "pelipper", "types": ["flying", "water"], "stats": {"speed": 65, "special-defense": 70, "special-attack": 95, "defense": 100, "attack": 50, "hp": 60}}
\ No newline at end of file
+{"name": "pelipper", "types": ["water", "flying"], "stats": {"hp": 60, "attack": 50, "defense": 100, "special-attack": 95, "special-defense": 70, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_28.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_28.json
index 7bcae4a..dfd5b74 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_28.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_28.json
@@ -1,1 +1,1 @@
-{"name": "sandslash", "types": ["ground"], "stats": {"speed": 65, "special-defense": 55, "special-attack": 45, "defense": 110, "attack": 100, "hp": 75}}
\ No newline at end of file
+{"name": "sandslash", "types": ["ground"], "stats": {"hp": 75, "attack": 100, "defense": 110, "special-attack": 45, "special-defense": 55, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_280.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_280.json
index c5480ef..fb70366 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_280.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_280.json
@@ -1,1 +1,1 @@
-{"name": "ralts", "types": ["fairy", "psychic"], "stats": {"speed": 40, "special-defense": 35, "special-attack": 45, "defense": 25, "attack": 25, "hp": 28}}
\ No newline at end of file
+{"name": "ralts", "types": ["psychic", "fairy"], "stats": {"hp": 28, "attack": 25, "defense": 25, "special-attack": 45, "special-defense": 35, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_281.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_281.json
index 07c9ce1..1133b22 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_281.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_281.json
@@ -1,1 +1,1 @@
-{"name": "kirlia", "types": ["fairy", "psychic"], "stats": {"speed": 50, "special-defense": 55, "special-attack": 65, "defense": 35, "attack": 35, "hp": 38}}
\ No newline at end of file
+{"name": "kirlia", "types": ["psychic", "fairy"], "stats": {"hp": 38, "attack": 35, "defense": 35, "special-attack": 65, "special-defense": 55, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_282.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_282.json
index 7c6f8af..2f08361 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_282.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_282.json
@@ -1,1 +1,1 @@
-{"name": "gardevoir", "types": ["fairy", "psychic"], "stats": {"speed": 80, "special-defense": 115, "special-attack": 125, "defense": 65, "attack": 65, "hp": 68}}
\ No newline at end of file
+{"name": "gardevoir", "types": ["psychic", "fairy"], "stats": {"hp": 68, "attack": 65, "defense": 65, "special-attack": 125, "special-defense": 115, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_283.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_283.json
index 9fda454..8480565 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_283.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_283.json
@@ -1,1 +1,1 @@
-{"name": "surskit", "types": ["water", "bug"], "stats": {"speed": 65, "special-defense": 52, "special-attack": 50, "defense": 32, "attack": 30, "hp": 40}}
\ No newline at end of file
+{"name": "surskit", "types": ["bug", "water"], "stats": {"hp": 40, "attack": 30, "defense": 32, "special-attack": 50, "special-defense": 52, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_284.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_284.json
index 0b6acaf..ee6727d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_284.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_284.json
@@ -1,1 +1,1 @@
-{"name": "masquerain", "types": ["flying", "bug"], "stats": {"speed": 80, "special-defense": 82, "special-attack": 100, "defense": 62, "attack": 60, "hp": 70}}
\ No newline at end of file
+{"name": "masquerain", "types": ["bug", "flying"], "stats": {"hp": 70, "attack": 60, "defense": 62, "special-attack": 100, "special-defense": 82, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_285.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_285.json
index 8aee05c..cd4b628 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_285.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_285.json
@@ -1,1 +1,1 @@
-{"name": "shroomish", "types": ["grass"], "stats": {"speed": 35, "special-defense": 60, "special-attack": 40, "defense": 60, "attack": 40, "hp": 60}}
\ No newline at end of file
+{"name": "shroomish", "types": ["grass"], "stats": {"hp": 60, "attack": 40, "defense": 60, "special-attack": 40, "special-defense": 60, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_286.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_286.json
index 46a3bbb..41457e7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_286.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_286.json
@@ -1,1 +1,1 @@
-{"name": "breloom", "types": ["fighting", "grass"], "stats": {"speed": 70, "special-defense": 60, "special-attack": 60, "defense": 80, "attack": 130, "hp": 60}}
\ No newline at end of file
+{"name": "breloom", "types": ["grass", "fighting"], "stats": {"hp": 60, "attack": 130, "defense": 80, "special-attack": 60, "special-defense": 60, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_287.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_287.json
index a0b90ec..28d066e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_287.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_287.json
@@ -1,1 +1,1 @@
-{"name": "slakoth", "types": ["normal"], "stats": {"speed": 30, "special-defense": 35, "special-attack": 35, "defense": 60, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "slakoth", "types": ["normal"], "stats": {"hp": 60, "attack": 60, "defense": 60, "special-attack": 35, "special-defense": 35, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_288.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_288.json
index bfcb443..a061131 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_288.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_288.json
@@ -1,1 +1,1 @@
-{"name": "vigoroth", "types": ["normal"], "stats": {"speed": 90, "special-defense": 55, "special-attack": 55, "defense": 80, "attack": 80, "hp": 80}}
\ No newline at end of file
+{"name": "vigoroth", "types": ["normal"], "stats": {"hp": 80, "attack": 80, "defense": 80, "special-attack": 55, "special-defense": 55, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_289.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_289.json
index 45eb048..616b733 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_289.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_289.json
@@ -1,1 +1,1 @@
-{"name": "slaking", "types": ["normal"], "stats": {"speed": 100, "special-defense": 65, "special-attack": 95, "defense": 100, "attack": 160, "hp": 150}}
\ No newline at end of file
+{"name": "slaking", "types": ["normal"], "stats": {"hp": 150, "attack": 160, "defense": 100, "special-attack": 95, "special-defense": 65, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_29.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_29.json
index e73bda9..a5a7ed2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_29.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_29.json
@@ -1,1 +1,1 @@
-{"name": "nidoran-f", "types": ["poison"], "stats": {"speed": 41, "special-defense": 40, "special-attack": 40, "defense": 52, "attack": 47, "hp": 55}}
\ No newline at end of file
+{"name": "nidoran-f", "types": ["poison"], "stats": {"hp": 55, "attack": 47, "defense": 52, "special-attack": 40, "special-defense": 40, "speed": 41}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_290.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_290.json
index a6c837e..43928e1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_290.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_290.json
@@ -1,1 +1,1 @@
-{"name": "nincada", "types": ["ground", "bug"], "stats": {"speed": 40, "special-defense": 30, "special-attack": 30, "defense": 90, "attack": 45, "hp": 31}}
\ No newline at end of file
+{"name": "nincada", "types": ["bug", "ground"], "stats": {"hp": 31, "attack": 45, "defense": 90, "special-attack": 30, "special-defense": 30, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_291.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_291.json
index 5811d62..4556323 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_291.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_291.json
@@ -1,1 +1,1 @@
-{"name": "ninjask", "types": ["flying", "bug"], "stats": {"speed": 160, "special-defense": 50, "special-attack": 50, "defense": 45, "attack": 90, "hp": 61}}
\ No newline at end of file
+{"name": "ninjask", "types": ["bug", "flying"], "stats": {"hp": 61, "attack": 90, "defense": 45, "special-attack": 50, "special-defense": 50, "speed": 160}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_292.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_292.json
index cbe9965..76a1825 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_292.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_292.json
@@ -1,1 +1,1 @@
-{"name": "shedinja", "types": ["ghost", "bug"], "stats": {"speed": 40, "special-defense": 30, "special-attack": 30, "defense": 45, "attack": 90, "hp": 1}}
\ No newline at end of file
+{"name": "shedinja", "types": ["bug", "ghost"], "stats": {"hp": 1, "attack": 90, "defense": 45, "special-attack": 30, "special-defense": 30, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_293.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_293.json
index fcc7908..9b4b083 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_293.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_293.json
@@ -1,1 +1,1 @@
-{"name": "whismur", "types": ["normal"], "stats": {"speed": 28, "special-defense": 23, "special-attack": 51, "defense": 23, "attack": 51, "hp": 64}}
\ No newline at end of file
+{"name": "whismur", "types": ["normal"], "stats": {"hp": 64, "attack": 51, "defense": 23, "special-attack": 51, "special-defense": 23, "speed": 28}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_294.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_294.json
index 6270c64..31e0120 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_294.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_294.json
@@ -1,1 +1,1 @@
-{"name": "loudred", "types": ["normal"], "stats": {"speed": 48, "special-defense": 43, "special-attack": 71, "defense": 43, "attack": 71, "hp": 84}}
\ No newline at end of file
+{"name": "loudred", "types": ["normal"], "stats": {"hp": 84, "attack": 71, "defense": 43, "special-attack": 71, "special-defense": 43, "speed": 48}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_295.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_295.json
index d75696d..906252b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_295.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_295.json
@@ -1,1 +1,1 @@
-{"name": "exploud", "types": ["normal"], "stats": {"speed": 68, "special-defense": 73, "special-attack": 91, "defense": 63, "attack": 91, "hp": 104}}
\ No newline at end of file
+{"name": "exploud", "types": ["normal"], "stats": {"hp": 104, "attack": 91, "defense": 63, "special-attack": 91, "special-defense": 73, "speed": 68}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_296.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_296.json
index 8625cf6..f0cf7dd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_296.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_296.json
@@ -1,1 +1,1 @@
-{"name": "makuhita", "types": ["fighting"], "stats": {"speed": 25, "special-defense": 30, "special-attack": 20, "defense": 30, "attack": 60, "hp": 72}}
\ No newline at end of file
+{"name": "makuhita", "types": ["fighting"], "stats": {"hp": 72, "attack": 60, "defense": 30, "special-attack": 20, "special-defense": 30, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_297.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_297.json
index a42399d..8f7acd4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_297.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_297.json
@@ -1,1 +1,1 @@
-{"name": "hariyama", "types": ["fighting"], "stats": {"speed": 50, "special-defense": 60, "special-attack": 40, "defense": 60, "attack": 120, "hp": 144}}
\ No newline at end of file
+{"name": "hariyama", "types": ["fighting"], "stats": {"hp": 144, "attack": 120, "defense": 60, "special-attack": 40, "special-defense": 60, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_298.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_298.json
index d4ffcad..d207895 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_298.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_298.json
@@ -1,1 +1,1 @@
-{"name": "azurill", "types": ["fairy", "normal"], "stats": {"speed": 20, "special-defense": 40, "special-attack": 20, "defense": 40, "attack": 20, "hp": 50}}
\ No newline at end of file
+{"name": "azurill", "types": ["normal", "fairy"], "stats": {"hp": 50, "attack": 20, "defense": 40, "special-attack": 20, "special-defense": 40, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_299.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_299.json
index 1e9d9de..d1ca7b3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_299.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_299.json
@@ -1,1 +1,1 @@
-{"name": "nosepass", "types": ["rock"], "stats": {"speed": 30, "special-defense": 90, "special-attack": 45, "defense": 135, "attack": 45, "hp": 30}}
\ No newline at end of file
+{"name": "nosepass", "types": ["rock"], "stats": {"hp": 30, "attack": 45, "defense": 135, "special-attack": 45, "special-defense": 90, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_3.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_3.json
index 18d009c..a634118 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_3.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_3.json
@@ -1,1 +1,1 @@
-{"name": "venusaur", "types": ["poison", "grass"], "stats": {"speed": 80, "special-defense": 100, "special-attack": 100, "defense": 83, "attack": 82, "hp": 80}}
\ No newline at end of file
+{"name": "venusaur", "types": ["grass", "poison"], "stats": {"hp": 80, "attack": 82, "defense": 83, "special-attack": 100, "special-defense": 100, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_30.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_30.json
index 817b029..5b024e1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_30.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_30.json
@@ -1,1 +1,1 @@
-{"name": "nidorina", "types": ["poison"], "stats": {"speed": 56, "special-defense": 55, "special-attack": 55, "defense": 67, "attack": 62, "hp": 70}}
\ No newline at end of file
+{"name": "nidorina", "types": ["poison"], "stats": {"hp": 70, "attack": 62, "defense": 67, "special-attack": 55, "special-defense": 55, "speed": 56}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_300.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_300.json
index 0d1e363..fe73e78 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_300.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_300.json
@@ -1,1 +1,1 @@
-{"name": "skitty", "types": ["normal"], "stats": {"speed": 50, "special-defense": 35, "special-attack": 35, "defense": 45, "attack": 45, "hp": 50}}
\ No newline at end of file
+{"name": "skitty", "types": ["normal"], "stats": {"hp": 50, "attack": 45, "defense": 45, "special-attack": 35, "special-defense": 35, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_301.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_301.json
index 88ecd97..9fefe41 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_301.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_301.json
@@ -1,1 +1,1 @@
-{"name": "delcatty", "types": ["normal"], "stats": {"speed": 90, "special-defense": 55, "special-attack": 55, "defense": 65, "attack": 65, "hp": 70}}
\ No newline at end of file
+{"name": "delcatty", "types": ["normal"], "stats": {"hp": 70, "attack": 65, "defense": 65, "special-attack": 55, "special-defense": 55, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_302.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_302.json
index 837dd54..5cf248e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_302.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_302.json
@@ -1,1 +1,1 @@
-{"name": "sableye", "types": ["ghost", "dark"], "stats": {"speed": 50, "special-defense": 65, "special-attack": 65, "defense": 75, "attack": 75, "hp": 50}}
\ No newline at end of file
+{"name": "sableye", "types": ["dark", "ghost"], "stats": {"hp": 50, "attack": 75, "defense": 75, "special-attack": 65, "special-defense": 65, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_303.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_303.json
index f0d4722..1e09cd5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_303.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_303.json
@@ -1,1 +1,1 @@
-{"name": "mawile", "types": ["fairy", "steel"], "stats": {"speed": 50, "special-defense": 55, "special-attack": 55, "defense": 85, "attack": 85, "hp": 50}}
\ No newline at end of file
+{"name": "mawile", "types": ["steel", "fairy"], "stats": {"hp": 50, "attack": 85, "defense": 85, "special-attack": 55, "special-defense": 55, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_304.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_304.json
index c04fc6a..f4cbcdf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_304.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_304.json
@@ -1,1 +1,1 @@
-{"name": "aron", "types": ["rock", "steel"], "stats": {"speed": 30, "special-defense": 40, "special-attack": 40, "defense": 100, "attack": 70, "hp": 50}}
\ No newline at end of file
+{"name": "aron", "types": ["steel", "rock"], "stats": {"hp": 50, "attack": 70, "defense": 100, "special-attack": 40, "special-defense": 40, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_305.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_305.json
index bf69a41..a294f43 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_305.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_305.json
@@ -1,1 +1,1 @@
-{"name": "lairon", "types": ["rock", "steel"], "stats": {"speed": 40, "special-defense": 50, "special-attack": 50, "defense": 140, "attack": 90, "hp": 60}}
\ No newline at end of file
+{"name": "lairon", "types": ["steel", "rock"], "stats": {"hp": 60, "attack": 90, "defense": 140, "special-attack": 50, "special-defense": 50, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_306.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_306.json
index 9690e3a..69a17f1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_306.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_306.json
@@ -1,1 +1,1 @@
-{"name": "aggron", "types": ["rock", "steel"], "stats": {"speed": 50, "special-defense": 60, "special-attack": 60, "defense": 180, "attack": 110, "hp": 70}}
\ No newline at end of file
+{"name": "aggron", "types": ["steel", "rock"], "stats": {"hp": 70, "attack": 110, "defense": 180, "special-attack": 60, "special-defense": 60, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_307.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_307.json
index ca4294b..973b503 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_307.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_307.json
@@ -1,1 +1,1 @@
-{"name": "meditite", "types": ["psychic", "fighting"], "stats": {"speed": 60, "special-defense": 55, "special-attack": 40, "defense": 55, "attack": 40, "hp": 30}}
\ No newline at end of file
+{"name": "meditite", "types": ["fighting", "psychic"], "stats": {"hp": 30, "attack": 40, "defense": 55, "special-attack": 40, "special-defense": 55, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_308.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_308.json
index 872f3ca..7fb4ed6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_308.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_308.json
@@ -1,1 +1,1 @@
-{"name": "medicham", "types": ["psychic", "fighting"], "stats": {"speed": 80, "special-defense": 75, "special-attack": 60, "defense": 75, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "medicham", "types": ["fighting", "psychic"], "stats": {"hp": 60, "attack": 60, "defense": 75, "special-attack": 60, "special-defense": 75, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_309.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_309.json
index 6db8558..2e052ca 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_309.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_309.json
@@ -1,1 +1,1 @@
-{"name": "electrike", "types": ["electric"], "stats": {"speed": 65, "special-defense": 40, "special-attack": 65, "defense": 40, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "electrike", "types": ["electric"], "stats": {"hp": 40, "attack": 45, "defense": 40, "special-attack": 65, "special-defense": 40, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_31.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_31.json
index 0fc8efc..916ed5d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_31.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_31.json
@@ -1,1 +1,1 @@
-{"name": "nidoqueen", "types": ["ground", "poison"], "stats": {"speed": 76, "special-defense": 85, "special-attack": 75, "defense": 87, "attack": 92, "hp": 90}}
\ No newline at end of file
+{"name": "nidoqueen", "types": ["poison", "ground"], "stats": {"hp": 90, "attack": 92, "defense": 87, "special-attack": 75, "special-defense": 85, "speed": 76}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_310.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_310.json
index e70a7b0..ec02e2f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_310.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_310.json
@@ -1,1 +1,1 @@
-{"name": "manectric", "types": ["electric"], "stats": {"speed": 105, "special-defense": 60, "special-attack": 105, "defense": 60, "attack": 75, "hp": 70}}
\ No newline at end of file
+{"name": "manectric", "types": ["electric"], "stats": {"hp": 70, "attack": 75, "defense": 60, "special-attack": 105, "special-defense": 60, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_311.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_311.json
index 4c228dd..1b412d1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_311.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_311.json
@@ -1,1 +1,1 @@
-{"name": "plusle", "types": ["electric"], "stats": {"speed": 95, "special-defense": 75, "special-attack": 85, "defense": 40, "attack": 50, "hp": 60}}
\ No newline at end of file
+{"name": "plusle", "types": ["electric"], "stats": {"hp": 60, "attack": 50, "defense": 40, "special-attack": 85, "special-defense": 75, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_312.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_312.json
index 7f1887c..dfbf78d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_312.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_312.json
@@ -1,1 +1,1 @@
-{"name": "minun", "types": ["electric"], "stats": {"speed": 95, "special-defense": 85, "special-attack": 75, "defense": 50, "attack": 40, "hp": 60}}
\ No newline at end of file
+{"name": "minun", "types": ["electric"], "stats": {"hp": 60, "attack": 40, "defense": 50, "special-attack": 75, "special-defense": 85, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_313.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_313.json
index f8cab33..1c8a48b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_313.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_313.json
@@ -1,1 +1,1 @@
-{"name": "volbeat", "types": ["bug"], "stats": {"speed": 85, "special-defense": 85, "special-attack": 47, "defense": 75, "attack": 73, "hp": 65}}
\ No newline at end of file
+{"name": "volbeat", "types": ["bug"], "stats": {"hp": 65, "attack": 73, "defense": 75, "special-attack": 47, "special-defense": 85, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_314.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_314.json
index 26bb3e8..960fd1b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_314.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_314.json
@@ -1,1 +1,1 @@
-{"name": "illumise", "types": ["bug"], "stats": {"speed": 85, "special-defense": 85, "special-attack": 73, "defense": 75, "attack": 47, "hp": 65}}
\ No newline at end of file
+{"name": "illumise", "types": ["bug"], "stats": {"hp": 65, "attack": 47, "defense": 75, "special-attack": 73, "special-defense": 85, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_315.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_315.json
index 405d8af..d0c2b0e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_315.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_315.json
@@ -1,1 +1,1 @@
-{"name": "roselia", "types": ["poison", "grass"], "stats": {"speed": 65, "special-defense": 80, "special-attack": 100, "defense": 45, "attack": 60, "hp": 50}}
\ No newline at end of file
+{"name": "roselia", "types": ["grass", "poison"], "stats": {"hp": 50, "attack": 60, "defense": 45, "special-attack": 100, "special-defense": 80, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_316.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_316.json
index b1dde62..0e46956 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_316.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_316.json
@@ -1,1 +1,1 @@
-{"name": "gulpin", "types": ["poison"], "stats": {"speed": 40, "special-defense": 53, "special-attack": 43, "defense": 53, "attack": 43, "hp": 70}}
\ No newline at end of file
+{"name": "gulpin", "types": ["poison"], "stats": {"hp": 70, "attack": 43, "defense": 53, "special-attack": 43, "special-defense": 53, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_317.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_317.json
index cef871f..e985a8f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_317.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_317.json
@@ -1,1 +1,1 @@
-{"name": "swalot", "types": ["poison"], "stats": {"speed": 55, "special-defense": 83, "special-attack": 73, "defense": 83, "attack": 73, "hp": 100}}
\ No newline at end of file
+{"name": "swalot", "types": ["poison"], "stats": {"hp": 100, "attack": 73, "defense": 83, "special-attack": 73, "special-defense": 83, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_318.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_318.json
index 4b282a3..b3b028d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_318.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_318.json
@@ -1,1 +1,1 @@
-{"name": "carvanha", "types": ["dark", "water"], "stats": {"speed": 65, "special-defense": 20, "special-attack": 65, "defense": 20, "attack": 90, "hp": 45}}
\ No newline at end of file
+{"name": "carvanha", "types": ["water", "dark"], "stats": {"hp": 45, "attack": 90, "defense": 20, "special-attack": 65, "special-defense": 20, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_319.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_319.json
index 58adf46..8961329 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_319.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_319.json
@@ -1,1 +1,1 @@
-{"name": "sharpedo", "types": ["dark", "water"], "stats": {"speed": 95, "special-defense": 40, "special-attack": 95, "defense": 40, "attack": 120, "hp": 70}}
\ No newline at end of file
+{"name": "sharpedo", "types": ["water", "dark"], "stats": {"hp": 70, "attack": 120, "defense": 40, "special-attack": 95, "special-defense": 40, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_32.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_32.json
index 12c776f..c6b3745 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_32.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_32.json
@@ -1,1 +1,1 @@
-{"name": "nidoran-m", "types": ["poison"], "stats": {"speed": 50, "special-defense": 40, "special-attack": 40, "defense": 40, "attack": 57, "hp": 46}}
\ No newline at end of file
+{"name": "nidoran-m", "types": ["poison"], "stats": {"hp": 46, "attack": 57, "defense": 40, "special-attack": 40, "special-defense": 40, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_320.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_320.json
index 0462ad0..ff4e071 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_320.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_320.json
@@ -1,1 +1,1 @@
-{"name": "wailmer", "types": ["water"], "stats": {"speed": 60, "special-defense": 35, "special-attack": 70, "defense": 35, "attack": 70, "hp": 130}}
\ No newline at end of file
+{"name": "wailmer", "types": ["water"], "stats": {"hp": 130, "attack": 70, "defense": 35, "special-attack": 70, "special-defense": 35, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_321.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_321.json
index 09ab112..cb63e1d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_321.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_321.json
@@ -1,1 +1,1 @@
-{"name": "wailord", "types": ["water"], "stats": {"speed": 60, "special-defense": 45, "special-attack": 90, "defense": 45, "attack": 90, "hp": 170}}
\ No newline at end of file
+{"name": "wailord", "types": ["water"], "stats": {"hp": 170, "attack": 90, "defense": 45, "special-attack": 90, "special-defense": 45, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_322.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_322.json
index dd9a03d..6539d2f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_322.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_322.json
@@ -1,1 +1,1 @@
-{"name": "numel", "types": ["ground", "fire"], "stats": {"speed": 35, "special-defense": 45, "special-attack": 65, "defense": 40, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "numel", "types": ["fire", "ground"], "stats": {"hp": 60, "attack": 60, "defense": 40, "special-attack": 65, "special-defense": 45, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_323.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_323.json
index b22e60d..e72699d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_323.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_323.json
@@ -1,1 +1,1 @@
-{"name": "camerupt", "types": ["ground", "fire"], "stats": {"speed": 40, "special-defense": 75, "special-attack": 105, "defense": 70, "attack": 100, "hp": 70}}
\ No newline at end of file
+{"name": "camerupt", "types": ["fire", "ground"], "stats": {"hp": 70, "attack": 100, "defense": 70, "special-attack": 105, "special-defense": 75, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_324.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_324.json
index d390239..54d636d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_324.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_324.json
@@ -1,1 +1,1 @@
-{"name": "torkoal", "types": ["fire"], "stats": {"speed": 20, "special-defense": 70, "special-attack": 85, "defense": 140, "attack": 85, "hp": 70}}
\ No newline at end of file
+{"name": "torkoal", "types": ["fire"], "stats": {"hp": 70, "attack": 85, "defense": 140, "special-attack": 85, "special-defense": 70, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_325.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_325.json
index 132ca7b..53757c4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_325.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_325.json
@@ -1,1 +1,1 @@
-{"name": "spoink", "types": ["psychic"], "stats": {"speed": 60, "special-defense": 80, "special-attack": 70, "defense": 35, "attack": 25, "hp": 60}}
\ No newline at end of file
+{"name": "spoink", "types": ["psychic"], "stats": {"hp": 60, "attack": 25, "defense": 35, "special-attack": 70, "special-defense": 80, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_326.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_326.json
index fe12b0c..c012ad6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_326.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_326.json
@@ -1,1 +1,1 @@
-{"name": "grumpig", "types": ["psychic"], "stats": {"speed": 80, "special-defense": 110, "special-attack": 90, "defense": 65, "attack": 45, "hp": 80}}
\ No newline at end of file
+{"name": "grumpig", "types": ["psychic"], "stats": {"hp": 80, "attack": 45, "defense": 65, "special-attack": 90, "special-defense": 110, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_327.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_327.json
index cbc2539..d9988c3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_327.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_327.json
@@ -1,1 +1,1 @@
-{"name": "spinda", "types": ["normal"], "stats": {"speed": 60, "special-defense": 60, "special-attack": 60, "defense": 60, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "spinda", "types": ["normal"], "stats": {"hp": 60, "attack": 60, "defense": 60, "special-attack": 60, "special-defense": 60, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_328.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_328.json
index fec14a3..b22787d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_328.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_328.json
@@ -1,1 +1,1 @@
-{"name": "trapinch", "types": ["ground"], "stats": {"speed": 10, "special-defense": 45, "special-attack": 45, "defense": 45, "attack": 100, "hp": 45}}
\ No newline at end of file
+{"name": "trapinch", "types": ["ground"], "stats": {"hp": 45, "attack": 100, "defense": 45, "special-attack": 45, "special-defense": 45, "speed": 10}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_329.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_329.json
index aee74dc..16b5547 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_329.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_329.json
@@ -1,1 +1,1 @@
-{"name": "vibrava", "types": ["dragon", "ground"], "stats": {"speed": 70, "special-defense": 50, "special-attack": 50, "defense": 50, "attack": 70, "hp": 50}}
\ No newline at end of file
+{"name": "vibrava", "types": ["ground", "dragon"], "stats": {"hp": 50, "attack": 70, "defense": 50, "special-attack": 50, "special-defense": 50, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_33.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_33.json
index b1460b4..87670a9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_33.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_33.json
@@ -1,1 +1,1 @@
-{"name": "nidorino", "types": ["poison"], "stats": {"speed": 65, "special-defense": 55, "special-attack": 55, "defense": 57, "attack": 72, "hp": 61}}
\ No newline at end of file
+{"name": "nidorino", "types": ["poison"], "stats": {"hp": 61, "attack": 72, "defense": 57, "special-attack": 55, "special-defense": 55, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_330.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_330.json
index ca5d183..915c1ed 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_330.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_330.json
@@ -1,1 +1,1 @@
-{"name": "flygon", "types": ["dragon", "ground"], "stats": {"speed": 100, "special-defense": 80, "special-attack": 80, "defense": 80, "attack": 100, "hp": 80}}
\ No newline at end of file
+{"name": "flygon", "types": ["ground", "dragon"], "stats": {"hp": 80, "attack": 100, "defense": 80, "special-attack": 80, "special-defense": 80, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_331.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_331.json
index 7590441..0ef79e5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_331.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_331.json
@@ -1,1 +1,1 @@
-{"name": "cacnea", "types": ["grass"], "stats": {"speed": 35, "special-defense": 40, "special-attack": 85, "defense": 40, "attack": 85, "hp": 50}}
\ No newline at end of file
+{"name": "cacnea", "types": ["grass"], "stats": {"hp": 50, "attack": 85, "defense": 40, "special-attack": 85, "special-defense": 40, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_332.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_332.json
index cd0f40b..0769dae 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_332.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_332.json
@@ -1,1 +1,1 @@
-{"name": "cacturne", "types": ["dark", "grass"], "stats": {"speed": 55, "special-defense": 60, "special-attack": 115, "defense": 60, "attack": 115, "hp": 70}}
\ No newline at end of file
+{"name": "cacturne", "types": ["grass", "dark"], "stats": {"hp": 70, "attack": 115, "defense": 60, "special-attack": 115, "special-defense": 60, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_333.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_333.json
index b7451d5..1cbb8ef 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_333.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_333.json
@@ -1,1 +1,1 @@
-{"name": "swablu", "types": ["flying", "normal"], "stats": {"speed": 50, "special-defense": 75, "special-attack": 40, "defense": 60, "attack": 40, "hp": 45}}
\ No newline at end of file
+{"name": "swablu", "types": ["normal", "flying"], "stats": {"hp": 45, "attack": 40, "defense": 60, "special-attack": 40, "special-defense": 75, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_334.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_334.json
index 3171824..9f97f19 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_334.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_334.json
@@ -1,1 +1,1 @@
-{"name": "altaria", "types": ["flying", "dragon"], "stats": {"speed": 80, "special-defense": 105, "special-attack": 70, "defense": 90, "attack": 70, "hp": 75}}
\ No newline at end of file
+{"name": "altaria", "types": ["dragon", "flying"], "stats": {"hp": 75, "attack": 70, "defense": 90, "special-attack": 70, "special-defense": 105, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_335.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_335.json
index c5acb68..0f79084 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_335.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_335.json
@@ -1,1 +1,1 @@
-{"name": "zangoose", "types": ["normal"], "stats": {"speed": 90, "special-defense": 60, "special-attack": 60, "defense": 60, "attack": 115, "hp": 73}}
\ No newline at end of file
+{"name": "zangoose", "types": ["normal"], "stats": {"hp": 73, "attack": 115, "defense": 60, "special-attack": 60, "special-defense": 60, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_336.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_336.json
index f0161c1..6299e8e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_336.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_336.json
@@ -1,1 +1,1 @@
-{"name": "seviper", "types": ["poison"], "stats": {"speed": 65, "special-defense": 60, "special-attack": 100, "defense": 60, "attack": 100, "hp": 73}}
\ No newline at end of file
+{"name": "seviper", "types": ["poison"], "stats": {"hp": 73, "attack": 100, "defense": 60, "special-attack": 100, "special-defense": 60, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_337.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_337.json
index 2250a69..1032321 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_337.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_337.json
@@ -1,1 +1,1 @@
-{"name": "lunatone", "types": ["psychic", "rock"], "stats": {"speed": 70, "special-defense": 85, "special-attack": 95, "defense": 65, "attack": 55, "hp": 90}}
\ No newline at end of file
+{"name": "lunatone", "types": ["rock", "psychic"], "stats": {"hp": 90, "attack": 55, "defense": 65, "special-attack": 95, "special-defense": 85, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_338.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_338.json
index 015e8bb..833bb0e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_338.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_338.json
@@ -1,1 +1,1 @@
-{"name": "solrock", "types": ["psychic", "rock"], "stats": {"speed": 70, "special-defense": 65, "special-attack": 55, "defense": 85, "attack": 95, "hp": 90}}
\ No newline at end of file
+{"name": "solrock", "types": ["rock", "psychic"], "stats": {"hp": 90, "attack": 95, "defense": 85, "special-attack": 55, "special-defense": 65, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_339.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_339.json
index 8df152f..80db0a4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_339.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_339.json
@@ -1,1 +1,1 @@
-{"name": "barboach", "types": ["ground", "water"], "stats": {"speed": 60, "special-defense": 41, "special-attack": 46, "defense": 43, "attack": 48, "hp": 50}}
\ No newline at end of file
+{"name": "barboach", "types": ["water", "ground"], "stats": {"hp": 50, "attack": 48, "defense": 43, "special-attack": 46, "special-defense": 41, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_34.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_34.json
index 52a0344..8e2d847 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_34.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_34.json
@@ -1,1 +1,1 @@
-{"name": "nidoking", "types": ["ground", "poison"], "stats": {"speed": 85, "special-defense": 75, "special-attack": 85, "defense": 77, "attack": 102, "hp": 81}}
\ No newline at end of file
+{"name": "nidoking", "types": ["poison", "ground"], "stats": {"hp": 81, "attack": 102, "defense": 77, "special-attack": 85, "special-defense": 75, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_340.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_340.json
index e392da7..f3a6028 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_340.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_340.json
@@ -1,1 +1,1 @@
-{"name": "whiscash", "types": ["ground", "water"], "stats": {"speed": 60, "special-defense": 71, "special-attack": 76, "defense": 73, "attack": 78, "hp": 110}}
\ No newline at end of file
+{"name": "whiscash", "types": ["water", "ground"], "stats": {"hp": 110, "attack": 78, "defense": 73, "special-attack": 76, "special-defense": 71, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_341.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_341.json
index 88daa2b..d6cb76d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_341.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_341.json
@@ -1,1 +1,1 @@
-{"name": "corphish", "types": ["water"], "stats": {"speed": 35, "special-defense": 35, "special-attack": 50, "defense": 65, "attack": 80, "hp": 43}}
\ No newline at end of file
+{"name": "corphish", "types": ["water"], "stats": {"hp": 43, "attack": 80, "defense": 65, "special-attack": 50, "special-defense": 35, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_342.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_342.json
index c741418..e1994b9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_342.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_342.json
@@ -1,1 +1,1 @@
-{"name": "crawdaunt", "types": ["dark", "water"], "stats": {"speed": 55, "special-defense": 55, "special-attack": 90, "defense": 85, "attack": 120, "hp": 63}}
\ No newline at end of file
+{"name": "crawdaunt", "types": ["water", "dark"], "stats": {"hp": 63, "attack": 120, "defense": 85, "special-attack": 90, "special-defense": 55, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_343.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_343.json
index 7f598a7..12536d0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_343.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_343.json
@@ -1,1 +1,1 @@
-{"name": "baltoy", "types": ["psychic", "ground"], "stats": {"speed": 55, "special-defense": 70, "special-attack": 40, "defense": 55, "attack": 40, "hp": 40}}
\ No newline at end of file
+{"name": "baltoy", "types": ["ground", "psychic"], "stats": {"hp": 40, "attack": 40, "defense": 55, "special-attack": 40, "special-defense": 70, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_344.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_344.json
index d6e56a4..6c56a4a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_344.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_344.json
@@ -1,1 +1,1 @@
-{"name": "claydol", "types": ["psychic", "ground"], "stats": {"speed": 75, "special-defense": 120, "special-attack": 70, "defense": 105, "attack": 70, "hp": 60}}
\ No newline at end of file
+{"name": "claydol", "types": ["ground", "psychic"], "stats": {"hp": 60, "attack": 70, "defense": 105, "special-attack": 70, "special-defense": 120, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_345.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_345.json
index 14f0a55..7b2e80a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_345.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_345.json
@@ -1,1 +1,1 @@
-{"name": "lileep", "types": ["grass", "rock"], "stats": {"speed": 23, "special-defense": 87, "special-attack": 61, "defense": 77, "attack": 41, "hp": 66}}
\ No newline at end of file
+{"name": "lileep", "types": ["rock", "grass"], "stats": {"hp": 66, "attack": 41, "defense": 77, "special-attack": 61, "special-defense": 87, "speed": 23}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_346.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_346.json
index d2bdbde..a5e96c6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_346.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_346.json
@@ -1,1 +1,1 @@
-{"name": "cradily", "types": ["grass", "rock"], "stats": {"speed": 43, "special-defense": 107, "special-attack": 81, "defense": 97, "attack": 81, "hp": 86}}
\ No newline at end of file
+{"name": "cradily", "types": ["rock", "grass"], "stats": {"hp": 86, "attack": 81, "defense": 97, "special-attack": 81, "special-defense": 107, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_347.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_347.json
index 5053df3..e4b4721 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_347.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_347.json
@@ -1,1 +1,1 @@
-{"name": "anorith", "types": ["bug", "rock"], "stats": {"speed": 75, "special-defense": 50, "special-attack": 40, "defense": 50, "attack": 95, "hp": 45}}
\ No newline at end of file
+{"name": "anorith", "types": ["rock", "bug"], "stats": {"hp": 45, "attack": 95, "defense": 50, "special-attack": 40, "special-defense": 50, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_348.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_348.json
index 6117525..419bb42 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_348.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_348.json
@@ -1,1 +1,1 @@
-{"name": "armaldo", "types": ["bug", "rock"], "stats": {"speed": 45, "special-defense": 80, "special-attack": 70, "defense": 100, "attack": 125, "hp": 75}}
\ No newline at end of file
+{"name": "armaldo", "types": ["rock", "bug"], "stats": {"hp": 75, "attack": 125, "defense": 100, "special-attack": 70, "special-defense": 80, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_349.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_349.json
index 4456aee..c27ca74 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_349.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_349.json
@@ -1,1 +1,1 @@
-{"name": "feebas", "types": ["water"], "stats": {"speed": 80, "special-defense": 55, "special-attack": 10, "defense": 20, "attack": 15, "hp": 20}}
\ No newline at end of file
+{"name": "feebas", "types": ["water"], "stats": {"hp": 20, "attack": 15, "defense": 20, "special-attack": 10, "special-defense": 55, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_35.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_35.json
index 2ad9774..23e6bea 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_35.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_35.json
@@ -1,1 +1,1 @@
-{"name": "clefairy", "types": ["fairy"], "stats": {"speed": 35, "special-defense": 65, "special-attack": 60, "defense": 48, "attack": 45, "hp": 70}}
\ No newline at end of file
+{"name": "clefairy", "types": ["fairy"], "stats": {"hp": 70, "attack": 45, "defense": 48, "special-attack": 60, "special-defense": 65, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_350.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_350.json
index e101191..8cfae58 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_350.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_350.json
@@ -1,1 +1,1 @@
-{"name": "milotic", "types": ["water"], "stats": {"speed": 81, "special-defense": 125, "special-attack": 100, "defense": 79, "attack": 60, "hp": 95}}
\ No newline at end of file
+{"name": "milotic", "types": ["water"], "stats": {"hp": 95, "attack": 60, "defense": 79, "special-attack": 100, "special-defense": 125, "speed": 81}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_351.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_351.json
index ad384f0..c3042b1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_351.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_351.json
@@ -1,1 +1,1 @@
-{"name": "castform", "types": ["normal"], "stats": {"speed": 70, "special-defense": 70, "special-attack": 70, "defense": 70, "attack": 70, "hp": 70}}
\ No newline at end of file
+{"name": "castform", "types": ["normal"], "stats": {"hp": 70, "attack": 70, "defense": 70, "special-attack": 70, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_352.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_352.json
index 8ac5ca7..3cf1507 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_352.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_352.json
@@ -1,1 +1,1 @@
-{"name": "kecleon", "types": ["normal"], "stats": {"speed": 40, "special-defense": 120, "special-attack": 60, "defense": 70, "attack": 90, "hp": 60}}
\ No newline at end of file
+{"name": "kecleon", "types": ["normal"], "stats": {"hp": 60, "attack": 90, "defense": 70, "special-attack": 60, "special-defense": 120, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_353.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_353.json
index 6ef9720..b02a918 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_353.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_353.json
@@ -1,1 +1,1 @@
-{"name": "shuppet", "types": ["ghost"], "stats": {"speed": 45, "special-defense": 33, "special-attack": 63, "defense": 35, "attack": 75, "hp": 44}}
\ No newline at end of file
+{"name": "shuppet", "types": ["ghost"], "stats": {"hp": 44, "attack": 75, "defense": 35, "special-attack": 63, "special-defense": 33, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_354.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_354.json
index f311fb6..1014f39 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_354.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_354.json
@@ -1,1 +1,1 @@
-{"name": "banette", "types": ["ghost"], "stats": {"speed": 65, "special-defense": 63, "special-attack": 83, "defense": 65, "attack": 115, "hp": 64}}
\ No newline at end of file
+{"name": "banette", "types": ["ghost"], "stats": {"hp": 64, "attack": 115, "defense": 65, "special-attack": 83, "special-defense": 63, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_355.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_355.json
index 5178464..e736467 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_355.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_355.json
@@ -1,1 +1,1 @@
-{"name": "duskull", "types": ["ghost"], "stats": {"speed": 25, "special-defense": 90, "special-attack": 30, "defense": 90, "attack": 40, "hp": 20}}
\ No newline at end of file
+{"name": "duskull", "types": ["ghost"], "stats": {"hp": 20, "attack": 40, "defense": 90, "special-attack": 30, "special-defense": 90, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_356.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_356.json
index 16d00bf..d66dc39 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_356.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_356.json
@@ -1,1 +1,1 @@
-{"name": "dusclops", "types": ["ghost"], "stats": {"speed": 25, "special-defense": 130, "special-attack": 60, "defense": 130, "attack": 70, "hp": 40}}
\ No newline at end of file
+{"name": "dusclops", "types": ["ghost"], "stats": {"hp": 40, "attack": 70, "defense": 130, "special-attack": 60, "special-defense": 130, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_357.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_357.json
index 2d3c4db..9eb50db 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_357.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_357.json
@@ -1,1 +1,1 @@
-{"name": "tropius", "types": ["flying", "grass"], "stats": {"speed": 51, "special-defense": 87, "special-attack": 72, "defense": 83, "attack": 68, "hp": 99}}
\ No newline at end of file
+{"name": "tropius", "types": ["grass", "flying"], "stats": {"hp": 99, "attack": 68, "defense": 83, "special-attack": 72, "special-defense": 87, "speed": 51}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_358.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_358.json
index 1970151..7c3cc89 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_358.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_358.json
@@ -1,1 +1,1 @@
-{"name": "chimecho", "types": ["psychic"], "stats": {"speed": 65, "special-defense": 90, "special-attack": 95, "defense": 80, "attack": 50, "hp": 75}}
\ No newline at end of file
+{"name": "chimecho", "types": ["psychic"], "stats": {"hp": 75, "attack": 50, "defense": 80, "special-attack": 95, "special-defense": 90, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_359.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_359.json
index a3081bf..8e4adc2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_359.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_359.json
@@ -1,1 +1,1 @@
-{"name": "absol", "types": ["dark"], "stats": {"speed": 75, "special-defense": 60, "special-attack": 75, "defense": 60, "attack": 130, "hp": 65}}
\ No newline at end of file
+{"name": "absol", "types": ["dark"], "stats": {"hp": 65, "attack": 130, "defense": 60, "special-attack": 75, "special-defense": 60, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_36.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_36.json
index 3f55687..504596b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_36.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_36.json
@@ -1,1 +1,1 @@
-{"name": "clefable", "types": ["fairy"], "stats": {"speed": 60, "special-defense": 90, "special-attack": 95, "defense": 73, "attack": 70, "hp": 95}}
\ No newline at end of file
+{"name": "clefable", "types": ["fairy"], "stats": {"hp": 95, "attack": 70, "defense": 73, "special-attack": 95, "special-defense": 90, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_360.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_360.json
index 765d0e8..94be732 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_360.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_360.json
@@ -1,1 +1,1 @@
-{"name": "wynaut", "types": ["psychic"], "stats": {"speed": 23, "special-defense": 48, "special-attack": 23, "defense": 48, "attack": 23, "hp": 95}}
\ No newline at end of file
+{"name": "wynaut", "types": ["psychic"], "stats": {"hp": 95, "attack": 23, "defense": 48, "special-attack": 23, "special-defense": 48, "speed": 23}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_361.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_361.json
index a8f388a..7f1666c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_361.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_361.json
@@ -1,1 +1,1 @@
-{"name": "snorunt", "types": ["ice"], "stats": {"speed": 50, "special-defense": 50, "special-attack": 50, "defense": 50, "attack": 50, "hp": 50}}
\ No newline at end of file
+{"name": "snorunt", "types": ["ice"], "stats": {"hp": 50, "attack": 50, "defense": 50, "special-attack": 50, "special-defense": 50, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_362.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_362.json
index 41bfc47..65ee6bd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_362.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_362.json
@@ -1,1 +1,1 @@
-{"name": "glalie", "types": ["ice"], "stats": {"speed": 80, "special-defense": 80, "special-attack": 80, "defense": 80, "attack": 80, "hp": 80}}
\ No newline at end of file
+{"name": "glalie", "types": ["ice"], "stats": {"hp": 80, "attack": 80, "defense": 80, "special-attack": 80, "special-defense": 80, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_363.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_363.json
index bb60a75..38b2fb6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_363.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_363.json
@@ -1,1 +1,1 @@
-{"name": "spheal", "types": ["water", "ice"], "stats": {"speed": 25, "special-defense": 50, "special-attack": 55, "defense": 50, "attack": 40, "hp": 70}}
\ No newline at end of file
+{"name": "spheal", "types": ["ice", "water"], "stats": {"hp": 70, "attack": 40, "defense": 50, "special-attack": 55, "special-defense": 50, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_364.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_364.json
index 4f2fda2..ffce81e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_364.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_364.json
@@ -1,1 +1,1 @@
-{"name": "sealeo", "types": ["water", "ice"], "stats": {"speed": 45, "special-defense": 70, "special-attack": 75, "defense": 70, "attack": 60, "hp": 90}}
\ No newline at end of file
+{"name": "sealeo", "types": ["ice", "water"], "stats": {"hp": 90, "attack": 60, "defense": 70, "special-attack": 75, "special-defense": 70, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_365.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_365.json
index f4e6734..e918488 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_365.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_365.json
@@ -1,1 +1,1 @@
-{"name": "walrein", "types": ["water", "ice"], "stats": {"speed": 65, "special-defense": 90, "special-attack": 95, "defense": 90, "attack": 80, "hp": 110}}
\ No newline at end of file
+{"name": "walrein", "types": ["ice", "water"], "stats": {"hp": 110, "attack": 80, "defense": 90, "special-attack": 95, "special-defense": 90, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_366.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_366.json
index bcdf169..af44208 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_366.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_366.json
@@ -1,1 +1,1 @@
-{"name": "clamperl", "types": ["water"], "stats": {"speed": 32, "special-defense": 55, "special-attack": 74, "defense": 85, "attack": 64, "hp": 35}}
\ No newline at end of file
+{"name": "clamperl", "types": ["water"], "stats": {"hp": 35, "attack": 64, "defense": 85, "special-attack": 74, "special-defense": 55, "speed": 32}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_367.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_367.json
index a51e0de..8ab4da2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_367.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_367.json
@@ -1,1 +1,1 @@
-{"name": "huntail", "types": ["water"], "stats": {"speed": 52, "special-defense": 75, "special-attack": 94, "defense": 105, "attack": 104, "hp": 55}}
\ No newline at end of file
+{"name": "huntail", "types": ["water"], "stats": {"hp": 55, "attack": 104, "defense": 105, "special-attack": 94, "special-defense": 75, "speed": 52}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_368.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_368.json
index 7ce9f42..1a4dd2c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_368.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_368.json
@@ -1,1 +1,1 @@
-{"name": "gorebyss", "types": ["water"], "stats": {"speed": 52, "special-defense": 75, "special-attack": 114, "defense": 105, "attack": 84, "hp": 55}}
\ No newline at end of file
+{"name": "gorebyss", "types": ["water"], "stats": {"hp": 55, "attack": 84, "defense": 105, "special-attack": 114, "special-defense": 75, "speed": 52}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_369.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_369.json
index 6225ff4..a7586bc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_369.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_369.json
@@ -1,1 +1,1 @@
-{"name": "relicanth", "types": ["rock", "water"], "stats": {"speed": 55, "special-defense": 65, "special-attack": 45, "defense": 130, "attack": 90, "hp": 100}}
\ No newline at end of file
+{"name": "relicanth", "types": ["water", "rock"], "stats": {"hp": 100, "attack": 90, "defense": 130, "special-attack": 45, "special-defense": 65, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_37.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_37.json
index 0c0c928..0bce0d3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_37.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_37.json
@@ -1,1 +1,1 @@
-{"name": "vulpix", "types": ["fire"], "stats": {"speed": 65, "special-defense": 65, "special-attack": 50, "defense": 40, "attack": 41, "hp": 38}}
\ No newline at end of file
+{"name": "vulpix", "types": ["fire"], "stats": {"hp": 38, "attack": 41, "defense": 40, "special-attack": 50, "special-defense": 65, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_370.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_370.json
index 76abcb4..5d585a8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_370.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_370.json
@@ -1,1 +1,1 @@
-{"name": "luvdisc", "types": ["water"], "stats": {"speed": 97, "special-defense": 65, "special-attack": 40, "defense": 55, "attack": 30, "hp": 43}}
\ No newline at end of file
+{"name": "luvdisc", "types": ["water"], "stats": {"hp": 43, "attack": 30, "defense": 55, "special-attack": 40, "special-defense": 65, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_371.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_371.json
index 8be2239..894bb03 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_371.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_371.json
@@ -1,1 +1,1 @@
-{"name": "bagon", "types": ["dragon"], "stats": {"speed": 50, "special-defense": 30, "special-attack": 40, "defense": 60, "attack": 75, "hp": 45}}
\ No newline at end of file
+{"name": "bagon", "types": ["dragon"], "stats": {"hp": 45, "attack": 75, "defense": 60, "special-attack": 40, "special-defense": 30, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_372.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_372.json
index 5ab572e..d391f77 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_372.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_372.json
@@ -1,1 +1,1 @@
-{"name": "shelgon", "types": ["dragon"], "stats": {"speed": 50, "special-defense": 50, "special-attack": 60, "defense": 100, "attack": 95, "hp": 65}}
\ No newline at end of file
+{"name": "shelgon", "types": ["dragon"], "stats": {"hp": 65, "attack": 95, "defense": 100, "special-attack": 60, "special-defense": 50, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_373.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_373.json
index a8e3bd6..7041ead 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_373.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_373.json
@@ -1,1 +1,1 @@
-{"name": "salamence", "types": ["flying", "dragon"], "stats": {"speed": 100, "special-defense": 80, "special-attack": 110, "defense": 80, "attack": 135, "hp": 95}}
\ No newline at end of file
+{"name": "salamence", "types": ["dragon", "flying"], "stats": {"hp": 95, "attack": 135, "defense": 80, "special-attack": 110, "special-defense": 80, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_374.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_374.json
index 64061e6..f76e763 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_374.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_374.json
@@ -1,1 +1,1 @@
-{"name": "beldum", "types": ["psychic", "steel"], "stats": {"speed": 30, "special-defense": 60, "special-attack": 35, "defense": 80, "attack": 55, "hp": 40}}
\ No newline at end of file
+{"name": "beldum", "types": ["steel", "psychic"], "stats": {"hp": 40, "attack": 55, "defense": 80, "special-attack": 35, "special-defense": 60, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_375.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_375.json
index d5a44fb..e897721 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_375.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_375.json
@@ -1,1 +1,1 @@
-{"name": "metang", "types": ["psychic", "steel"], "stats": {"speed": 50, "special-defense": 80, "special-attack": 55, "defense": 100, "attack": 75, "hp": 60}}
\ No newline at end of file
+{"name": "metang", "types": ["steel", "psychic"], "stats": {"hp": 60, "attack": 75, "defense": 100, "special-attack": 55, "special-defense": 80, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_376.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_376.json
index ae7a48f..7ad7573 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_376.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_376.json
@@ -1,1 +1,1 @@
-{"name": "metagross", "types": ["psychic", "steel"], "stats": {"speed": 70, "special-defense": 90, "special-attack": 95, "defense": 130, "attack": 135, "hp": 80}}
\ No newline at end of file
+{"name": "metagross", "types": ["steel", "psychic"], "stats": {"hp": 80, "attack": 135, "defense": 130, "special-attack": 95, "special-defense": 90, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_377.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_377.json
index 6630256..f272271 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_377.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_377.json
@@ -1,1 +1,1 @@
-{"name": "regirock", "types": ["rock"], "stats": {"speed": 50, "special-defense": 100, "special-attack": 50, "defense": 200, "attack": 100, "hp": 80}}
\ No newline at end of file
+{"name": "regirock", "types": ["rock"], "stats": {"hp": 80, "attack": 100, "defense": 200, "special-attack": 50, "special-defense": 100, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_378.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_378.json
index 3ec803a..57c494a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_378.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_378.json
@@ -1,1 +1,1 @@
-{"name": "regice", "types": ["ice"], "stats": {"speed": 50, "special-defense": 200, "special-attack": 100, "defense": 100, "attack": 50, "hp": 80}}
\ No newline at end of file
+{"name": "regice", "types": ["ice"], "stats": {"hp": 80, "attack": 50, "defense": 100, "special-attack": 100, "special-defense": 200, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_379.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_379.json
index 3e58482..4d06cdc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_379.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_379.json
@@ -1,1 +1,1 @@
-{"name": "registeel", "types": ["steel"], "stats": {"speed": 50, "special-defense": 150, "special-attack": 75, "defense": 150, "attack": 75, "hp": 80}}
\ No newline at end of file
+{"name": "registeel", "types": ["steel"], "stats": {"hp": 80, "attack": 75, "defense": 150, "special-attack": 75, "special-defense": 150, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_38.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_38.json
index 24034aa..0dc7909 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_38.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_38.json
@@ -1,1 +1,1 @@
-{"name": "ninetales", "types": ["fire"], "stats": {"speed": 100, "special-defense": 100, "special-attack": 81, "defense": 75, "attack": 76, "hp": 73}}
\ No newline at end of file
+{"name": "ninetales", "types": ["fire"], "stats": {"hp": 73, "attack": 76, "defense": 75, "special-attack": 81, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_380.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_380.json
index cb93a20..87f9c5f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_380.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_380.json
@@ -1,1 +1,1 @@
-{"name": "latias", "types": ["psychic", "dragon"], "stats": {"speed": 110, "special-defense": 130, "special-attack": 110, "defense": 90, "attack": 80, "hp": 80}}
\ No newline at end of file
+{"name": "latias", "types": ["dragon", "psychic"], "stats": {"hp": 80, "attack": 80, "defense": 90, "special-attack": 110, "special-defense": 130, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_381.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_381.json
index 4736e16..45508a4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_381.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_381.json
@@ -1,1 +1,1 @@
-{"name": "latios", "types": ["psychic", "dragon"], "stats": {"speed": 110, "special-defense": 110, "special-attack": 130, "defense": 80, "attack": 90, "hp": 80}}
\ No newline at end of file
+{"name": "latios", "types": ["dragon", "psychic"], "stats": {"hp": 80, "attack": 90, "defense": 80, "special-attack": 130, "special-defense": 110, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_382.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_382.json
index 35ce5e7..c659743 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_382.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_382.json
@@ -1,1 +1,1 @@
-{"name": "kyogre", "types": ["water"], "stats": {"speed": 90, "special-defense": 140, "special-attack": 150, "defense": 90, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "kyogre", "types": ["water"], "stats": {"hp": 100, "attack": 100, "defense": 90, "special-attack": 150, "special-defense": 140, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_383.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_383.json
index cd44bb7..5315b46 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_383.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_383.json
@@ -1,1 +1,1 @@
-{"name": "groudon", "types": ["ground"], "stats": {"speed": 90, "special-defense": 90, "special-attack": 100, "defense": 140, "attack": 150, "hp": 100}}
\ No newline at end of file
+{"name": "groudon", "types": ["ground"], "stats": {"hp": 100, "attack": 150, "defense": 140, "special-attack": 100, "special-defense": 90, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_384.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_384.json
index 92b72fc..d2cb6e9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_384.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_384.json
@@ -1,1 +1,1 @@
-{"name": "rayquaza", "types": ["flying", "dragon"], "stats": {"speed": 95, "special-defense": 90, "special-attack": 150, "defense": 90, "attack": 150, "hp": 105}}
\ No newline at end of file
+{"name": "rayquaza", "types": ["dragon", "flying"], "stats": {"hp": 105, "attack": 150, "defense": 90, "special-attack": 150, "special-defense": 90, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_385.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_385.json
index f17f056..dc68c0c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_385.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_385.json
@@ -1,1 +1,1 @@
-{"name": "jirachi", "types": ["psychic", "steel"], "stats": {"speed": 100, "special-defense": 100, "special-attack": 100, "defense": 100, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "jirachi", "types": ["steel", "psychic"], "stats": {"hp": 100, "attack": 100, "defense": 100, "special-attack": 100, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_386.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_386.json
index 313b8e7..42ed155 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_386.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_386.json
@@ -1,1 +1,1 @@
-{"name": "deoxys-normal", "types": ["psychic"], "stats": {"speed": 150, "special-defense": 50, "special-attack": 150, "defense": 50, "attack": 150, "hp": 50}}
\ No newline at end of file
+{"name": "deoxys-normal", "types": ["psychic"], "stats": {"hp": 50, "attack": 150, "defense": 50, "special-attack": 150, "special-defense": 50, "speed": 150}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_387.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_387.json
index f30fecd..8721670 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_387.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_387.json
@@ -1,1 +1,1 @@
-{"name": "turtwig", "types": ["grass"], "stats": {"speed": 31, "special-defense": 55, "special-attack": 45, "defense": 64, "attack": 68, "hp": 55}}
\ No newline at end of file
+{"name": "turtwig", "types": ["grass"], "stats": {"hp": 55, "attack": 68, "defense": 64, "special-attack": 45, "special-defense": 55, "speed": 31}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_388.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_388.json
index d96e325..0b002c7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_388.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_388.json
@@ -1,1 +1,1 @@
-{"name": "grotle", "types": ["grass"], "stats": {"speed": 36, "special-defense": 65, "special-attack": 55, "defense": 85, "attack": 89, "hp": 75}}
\ No newline at end of file
+{"name": "grotle", "types": ["grass"], "stats": {"hp": 75, "attack": 89, "defense": 85, "special-attack": 55, "special-defense": 65, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_389.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_389.json
index 8969ed2..5c4b54c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_389.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_389.json
@@ -1,1 +1,1 @@
-{"name": "torterra", "types": ["ground", "grass"], "stats": {"speed": 56, "special-defense": 85, "special-attack": 75, "defense": 105, "attack": 109, "hp": 95}}
\ No newline at end of file
+{"name": "torterra", "types": ["grass", "ground"], "stats": {"hp": 95, "attack": 109, "defense": 105, "special-attack": 75, "special-defense": 85, "speed": 56}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_39.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_39.json
index efef284..536be22 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_39.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_39.json
@@ -1,1 +1,1 @@
-{"name": "jigglypuff", "types": ["fairy", "normal"], "stats": {"speed": 20, "special-defense": 25, "special-attack": 45, "defense": 20, "attack": 45, "hp": 115}}
\ No newline at end of file
+{"name": "jigglypuff", "types": ["normal", "fairy"], "stats": {"hp": 115, "attack": 45, "defense": 20, "special-attack": 45, "special-defense": 25, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_390.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_390.json
index 5f80690..12b28f4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_390.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_390.json
@@ -1,1 +1,1 @@
-{"name": "chimchar", "types": ["fire"], "stats": {"speed": 61, "special-defense": 44, "special-attack": 58, "defense": 44, "attack": 58, "hp": 44}}
\ No newline at end of file
+{"name": "chimchar", "types": ["fire"], "stats": {"hp": 44, "attack": 58, "defense": 44, "special-attack": 58, "special-defense": 44, "speed": 61}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_391.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_391.json
index c5d1e48..cd28e88 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_391.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_391.json
@@ -1,1 +1,1 @@
-{"name": "monferno", "types": ["fighting", "fire"], "stats": {"speed": 81, "special-defense": 52, "special-attack": 78, "defense": 52, "attack": 78, "hp": 64}}
\ No newline at end of file
+{"name": "monferno", "types": ["fire", "fighting"], "stats": {"hp": 64, "attack": 78, "defense": 52, "special-attack": 78, "special-defense": 52, "speed": 81}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_392.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_392.json
index 95dad27..e23d738 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_392.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_392.json
@@ -1,1 +1,1 @@
-{"name": "infernape", "types": ["fighting", "fire"], "stats": {"speed": 108, "special-defense": 71, "special-attack": 104, "defense": 71, "attack": 104, "hp": 76}}
\ No newline at end of file
+{"name": "infernape", "types": ["fire", "fighting"], "stats": {"hp": 76, "attack": 104, "defense": 71, "special-attack": 104, "special-defense": 71, "speed": 108}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_393.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_393.json
index 621212b..0b3c1ea 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_393.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_393.json
@@ -1,1 +1,1 @@
-{"name": "piplup", "types": ["water"], "stats": {"speed": 40, "special-defense": 56, "special-attack": 61, "defense": 53, "attack": 51, "hp": 53}}
\ No newline at end of file
+{"name": "piplup", "types": ["water"], "stats": {"hp": 53, "attack": 51, "defense": 53, "special-attack": 61, "special-defense": 56, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_394.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_394.json
index 11efd97..dc23cee 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_394.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_394.json
@@ -1,1 +1,1 @@
-{"name": "prinplup", "types": ["water"], "stats": {"speed": 50, "special-defense": 76, "special-attack": 81, "defense": 68, "attack": 66, "hp": 64}}
\ No newline at end of file
+{"name": "prinplup", "types": ["water"], "stats": {"hp": 64, "attack": 66, "defense": 68, "special-attack": 81, "special-defense": 76, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_395.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_395.json
index bc237bf..4e34c96 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_395.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_395.json
@@ -1,1 +1,1 @@
-{"name": "empoleon", "types": ["steel", "water"], "stats": {"speed": 60, "special-defense": 101, "special-attack": 111, "defense": 88, "attack": 86, "hp": 84}}
\ No newline at end of file
+{"name": "empoleon", "types": ["water", "steel"], "stats": {"hp": 84, "attack": 86, "defense": 88, "special-attack": 111, "special-defense": 101, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_396.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_396.json
index 729004c..733e416 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_396.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_396.json
@@ -1,1 +1,1 @@
-{"name": "starly", "types": ["flying", "normal"], "stats": {"speed": 60, "special-defense": 30, "special-attack": 30, "defense": 30, "attack": 55, "hp": 40}}
\ No newline at end of file
+{"name": "starly", "types": ["normal", "flying"], "stats": {"hp": 40, "attack": 55, "defense": 30, "special-attack": 30, "special-defense": 30, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_397.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_397.json
index 3fdfe1f..717d234 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_397.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_397.json
@@ -1,1 +1,1 @@
-{"name": "staravia", "types": ["flying", "normal"], "stats": {"speed": 80, "special-defense": 40, "special-attack": 40, "defense": 50, "attack": 75, "hp": 55}}
\ No newline at end of file
+{"name": "staravia", "types": ["normal", "flying"], "stats": {"hp": 55, "attack": 75, "defense": 50, "special-attack": 40, "special-defense": 40, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_398.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_398.json
index a5e35cd..d411907 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_398.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_398.json
@@ -1,1 +1,1 @@
-{"name": "staraptor", "types": ["flying", "normal"], "stats": {"speed": 100, "special-defense": 60, "special-attack": 50, "defense": 70, "attack": 120, "hp": 85}}
\ No newline at end of file
+{"name": "staraptor", "types": ["normal", "flying"], "stats": {"hp": 85, "attack": 120, "defense": 70, "special-attack": 50, "special-defense": 60, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_399.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_399.json
index f93bfb6..e149d1c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_399.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_399.json
@@ -1,1 +1,1 @@
-{"name": "bidoof", "types": ["normal"], "stats": {"speed": 31, "special-defense": 40, "special-attack": 35, "defense": 40, "attack": 45, "hp": 59}}
\ No newline at end of file
+{"name": "bidoof", "types": ["normal"], "stats": {"hp": 59, "attack": 45, "defense": 40, "special-attack": 35, "special-defense": 40, "speed": 31}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_4.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_4.json
index 55c39ad..6684529 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_4.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_4.json
@@ -1,1 +1,1 @@
-{"name": "charmander", "types": ["fire"], "stats": {"speed": 65, "special-defense": 50, "special-attack": 60, "defense": 43, "attack": 52, "hp": 39}}
\ No newline at end of file
+{"name": "charmander", "types": ["fire"], "stats": {"hp": 39, "attack": 52, "defense": 43, "special-attack": 60, "special-defense": 50, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_40.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_40.json
index 9c01b34..9f0f0b9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_40.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_40.json
@@ -1,1 +1,1 @@
-{"name": "wigglytuff", "types": ["fairy", "normal"], "stats": {"speed": 45, "special-defense": 50, "special-attack": 85, "defense": 45, "attack": 70, "hp": 140}}
\ No newline at end of file
+{"name": "wigglytuff", "types": ["normal", "fairy"], "stats": {"hp": 140, "attack": 70, "defense": 45, "special-attack": 85, "special-defense": 50, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_400.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_400.json
index d30a80c..4ebac3c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_400.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_400.json
@@ -1,1 +1,1 @@
-{"name": "bibarel", "types": ["water", "normal"], "stats": {"speed": 71, "special-defense": 60, "special-attack": 55, "defense": 60, "attack": 85, "hp": 79}}
\ No newline at end of file
+{"name": "bibarel", "types": ["normal", "water"], "stats": {"hp": 79, "attack": 85, "defense": 60, "special-attack": 55, "special-defense": 60, "speed": 71}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_401.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_401.json
index dc0c309..6e88f0f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_401.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_401.json
@@ -1,1 +1,1 @@
-{"name": "kricketot", "types": ["bug"], "stats": {"speed": 25, "special-defense": 41, "special-attack": 25, "defense": 41, "attack": 25, "hp": 37}}
\ No newline at end of file
+{"name": "kricketot", "types": ["bug"], "stats": {"hp": 37, "attack": 25, "defense": 41, "special-attack": 25, "special-defense": 41, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_402.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_402.json
index f0a5e55..79bd763 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_402.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_402.json
@@ -1,1 +1,1 @@
-{"name": "kricketune", "types": ["bug"], "stats": {"speed": 65, "special-defense": 51, "special-attack": 55, "defense": 51, "attack": 85, "hp": 77}}
\ No newline at end of file
+{"name": "kricketune", "types": ["bug"], "stats": {"hp": 77, "attack": 85, "defense": 51, "special-attack": 55, "special-defense": 51, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_403.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_403.json
index 4c5b401..09e290f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_403.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_403.json
@@ -1,1 +1,1 @@
-{"name": "shinx", "types": ["electric"], "stats": {"speed": 45, "special-defense": 34, "special-attack": 40, "defense": 34, "attack": 65, "hp": 45}}
\ No newline at end of file
+{"name": "shinx", "types": ["electric"], "stats": {"hp": 45, "attack": 65, "defense": 34, "special-attack": 40, "special-defense": 34, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_404.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_404.json
index b53e4aa..dbbee90 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_404.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_404.json
@@ -1,1 +1,1 @@
-{"name": "luxio", "types": ["electric"], "stats": {"speed": 60, "special-defense": 49, "special-attack": 60, "defense": 49, "attack": 85, "hp": 60}}
\ No newline at end of file
+{"name": "luxio", "types": ["electric"], "stats": {"hp": 60, "attack": 85, "defense": 49, "special-attack": 60, "special-defense": 49, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_405.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_405.json
index 5d679a5..4bb662b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_405.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_405.json
@@ -1,1 +1,1 @@
-{"name": "luxray", "types": ["electric"], "stats": {"speed": 70, "special-defense": 79, "special-attack": 95, "defense": 79, "attack": 120, "hp": 80}}
\ No newline at end of file
+{"name": "luxray", "types": ["electric"], "stats": {"hp": 80, "attack": 120, "defense": 79, "special-attack": 95, "special-defense": 79, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_406.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_406.json
index 5c69b6e..31dfc1d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_406.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_406.json
@@ -1,1 +1,1 @@
-{"name": "budew", "types": ["poison", "grass"], "stats": {"speed": 55, "special-defense": 70, "special-attack": 50, "defense": 35, "attack": 30, "hp": 40}}
\ No newline at end of file
+{"name": "budew", "types": ["grass", "poison"], "stats": {"hp": 40, "attack": 30, "defense": 35, "special-attack": 50, "special-defense": 70, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_407.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_407.json
index a37737e..df0dc3e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_407.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_407.json
@@ -1,1 +1,1 @@
-{"name": "roserade", "types": ["poison", "grass"], "stats": {"speed": 90, "special-defense": 105, "special-attack": 125, "defense": 65, "attack": 70, "hp": 60}}
\ No newline at end of file
+{"name": "roserade", "types": ["grass", "poison"], "stats": {"hp": 60, "attack": 70, "defense": 65, "special-attack": 125, "special-defense": 105, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_408.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_408.json
index 05b4f69..a178f5b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_408.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_408.json
@@ -1,1 +1,1 @@
-{"name": "cranidos", "types": ["rock"], "stats": {"speed": 58, "special-defense": 30, "special-attack": 30, "defense": 40, "attack": 125, "hp": 67}}
\ No newline at end of file
+{"name": "cranidos", "types": ["rock"], "stats": {"hp": 67, "attack": 125, "defense": 40, "special-attack": 30, "special-defense": 30, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_409.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_409.json
index b12d248..d24902f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_409.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_409.json
@@ -1,1 +1,1 @@
-{"name": "rampardos", "types": ["rock"], "stats": {"speed": 58, "special-defense": 50, "special-attack": 65, "defense": 60, "attack": 165, "hp": 97}}
\ No newline at end of file
+{"name": "rampardos", "types": ["rock"], "stats": {"hp": 97, "attack": 165, "defense": 60, "special-attack": 65, "special-defense": 50, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_41.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_41.json
index 164b50e..b23b0a2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_41.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_41.json
@@ -1,1 +1,1 @@
-{"name": "zubat", "types": ["flying", "poison"], "stats": {"speed": 55, "special-defense": 40, "special-attack": 30, "defense": 35, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "zubat", "types": ["poison", "flying"], "stats": {"hp": 40, "attack": 45, "defense": 35, "special-attack": 30, "special-defense": 40, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_410.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_410.json
index 478caa7..9f92db3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_410.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_410.json
@@ -1,1 +1,1 @@
-{"name": "shieldon", "types": ["steel", "rock"], "stats": {"speed": 30, "special-defense": 88, "special-attack": 42, "defense": 118, "attack": 42, "hp": 30}}
\ No newline at end of file
+{"name": "shieldon", "types": ["rock", "steel"], "stats": {"hp": 30, "attack": 42, "defense": 118, "special-attack": 42, "special-defense": 88, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_411.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_411.json
index 251e236..eb15c85 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_411.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_411.json
@@ -1,1 +1,1 @@
-{"name": "bastiodon", "types": ["steel", "rock"], "stats": {"speed": 30, "special-defense": 138, "special-attack": 47, "defense": 168, "attack": 52, "hp": 60}}
\ No newline at end of file
+{"name": "bastiodon", "types": ["rock", "steel"], "stats": {"hp": 60, "attack": 52, "defense": 168, "special-attack": 47, "special-defense": 138, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_412.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_412.json
index 4a86841..af55c6b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_412.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_412.json
@@ -1,1 +1,1 @@
-{"name": "burmy", "types": ["bug"], "stats": {"speed": 36, "special-defense": 45, "special-attack": 29, "defense": 45, "attack": 29, "hp": 40}}
\ No newline at end of file
+{"name": "burmy", "types": ["bug"], "stats": {"hp": 40, "attack": 29, "defense": 45, "special-attack": 29, "special-defense": 45, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_413.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_413.json
index 6361897..a440622 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_413.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_413.json
@@ -1,1 +1,1 @@
-{"name": "wormadam-plant", "types": ["grass", "bug"], "stats": {"speed": 36, "special-defense": 105, "special-attack": 79, "defense": 85, "attack": 59, "hp": 60}}
\ No newline at end of file
+{"name": "wormadam-plant", "types": ["bug", "grass"], "stats": {"hp": 60, "attack": 59, "defense": 85, "special-attack": 79, "special-defense": 105, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_414.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_414.json
index c5ecf54..3e13574 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_414.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_414.json
@@ -1,1 +1,1 @@
-{"name": "mothim", "types": ["flying", "bug"], "stats": {"speed": 66, "special-defense": 50, "special-attack": 94, "defense": 50, "attack": 94, "hp": 70}}
\ No newline at end of file
+{"name": "mothim", "types": ["bug", "flying"], "stats": {"hp": 70, "attack": 94, "defense": 50, "special-attack": 94, "special-defense": 50, "speed": 66}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_415.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_415.json
index 382209f..5d26dcc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_415.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_415.json
@@ -1,1 +1,1 @@
-{"name": "combee", "types": ["flying", "bug"], "stats": {"speed": 70, "special-defense": 42, "special-attack": 30, "defense": 42, "attack": 30, "hp": 30}}
\ No newline at end of file
+{"name": "combee", "types": ["bug", "flying"], "stats": {"hp": 30, "attack": 30, "defense": 42, "special-attack": 30, "special-defense": 42, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_416.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_416.json
index 2d3388a..aa1b30c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_416.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_416.json
@@ -1,1 +1,1 @@
-{"name": "vespiquen", "types": ["flying", "bug"], "stats": {"speed": 40, "special-defense": 102, "special-attack": 80, "defense": 102, "attack": 80, "hp": 70}}
\ No newline at end of file
+{"name": "vespiquen", "types": ["bug", "flying"], "stats": {"hp": 70, "attack": 80, "defense": 102, "special-attack": 80, "special-defense": 102, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_417.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_417.json
index 2ca233e..62f42e4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_417.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_417.json
@@ -1,1 +1,1 @@
-{"name": "pachirisu", "types": ["electric"], "stats": {"speed": 95, "special-defense": 90, "special-attack": 45, "defense": 70, "attack": 45, "hp": 60}}
\ No newline at end of file
+{"name": "pachirisu", "types": ["electric"], "stats": {"hp": 60, "attack": 45, "defense": 70, "special-attack": 45, "special-defense": 90, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_418.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_418.json
index 0ed8af0..b0531db 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_418.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_418.json
@@ -1,1 +1,1 @@
-{"name": "buizel", "types": ["water"], "stats": {"speed": 85, "special-defense": 30, "special-attack": 60, "defense": 35, "attack": 65, "hp": 55}}
\ No newline at end of file
+{"name": "buizel", "types": ["water"], "stats": {"hp": 55, "attack": 65, "defense": 35, "special-attack": 60, "special-defense": 30, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_419.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_419.json
index f3d8a24..cfdef94 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_419.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_419.json
@@ -1,1 +1,1 @@
-{"name": "floatzel", "types": ["water"], "stats": {"speed": 115, "special-defense": 50, "special-attack": 85, "defense": 55, "attack": 105, "hp": 85}}
\ No newline at end of file
+{"name": "floatzel", "types": ["water"], "stats": {"hp": 85, "attack": 105, "defense": 55, "special-attack": 85, "special-defense": 50, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_42.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_42.json
index 2524cc7..4972da2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_42.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_42.json
@@ -1,1 +1,1 @@
-{"name": "golbat", "types": ["flying", "poison"], "stats": {"speed": 90, "special-defense": 75, "special-attack": 65, "defense": 70, "attack": 80, "hp": 75}}
\ No newline at end of file
+{"name": "golbat", "types": ["poison", "flying"], "stats": {"hp": 75, "attack": 80, "defense": 70, "special-attack": 65, "special-defense": 75, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_420.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_420.json
index d4904c3..2c43040 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_420.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_420.json
@@ -1,1 +1,1 @@
-{"name": "cherubi", "types": ["grass"], "stats": {"speed": 35, "special-defense": 53, "special-attack": 62, "defense": 45, "attack": 35, "hp": 45}}
\ No newline at end of file
+{"name": "cherubi", "types": ["grass"], "stats": {"hp": 45, "attack": 35, "defense": 45, "special-attack": 62, "special-defense": 53, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_421.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_421.json
index 687703a..9134da1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_421.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_421.json
@@ -1,1 +1,1 @@
-{"name": "cherrim", "types": ["grass"], "stats": {"speed": 85, "special-defense": 78, "special-attack": 87, "defense": 70, "attack": 60, "hp": 70}}
\ No newline at end of file
+{"name": "cherrim", "types": ["grass"], "stats": {"hp": 70, "attack": 60, "defense": 70, "special-attack": 87, "special-defense": 78, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_422.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_422.json
index 47df396..e61fae3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_422.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_422.json
@@ -1,1 +1,1 @@
-{"name": "shellos", "types": ["water"], "stats": {"speed": 34, "special-defense": 62, "special-attack": 57, "defense": 48, "attack": 48, "hp": 76}}
\ No newline at end of file
+{"name": "shellos", "types": ["water"], "stats": {"hp": 76, "attack": 48, "defense": 48, "special-attack": 57, "special-defense": 62, "speed": 34}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_423.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_423.json
index 154b15a..4959175 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_423.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_423.json
@@ -1,1 +1,1 @@
-{"name": "gastrodon", "types": ["ground", "water"], "stats": {"speed": 39, "special-defense": 82, "special-attack": 92, "defense": 68, "attack": 83, "hp": 111}}
\ No newline at end of file
+{"name": "gastrodon", "types": ["water", "ground"], "stats": {"hp": 111, "attack": 83, "defense": 68, "special-attack": 92, "special-defense": 82, "speed": 39}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_424.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_424.json
index aeb4658..2046fab 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_424.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_424.json
@@ -1,1 +1,1 @@
-{"name": "ambipom", "types": ["normal"], "stats": {"speed": 115, "special-defense": 66, "special-attack": 60, "defense": 66, "attack": 100, "hp": 75}}
\ No newline at end of file
+{"name": "ambipom", "types": ["normal"], "stats": {"hp": 75, "attack": 100, "defense": 66, "special-attack": 60, "special-defense": 66, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_425.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_425.json
index 29f8527..09d84a2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_425.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_425.json
@@ -1,1 +1,1 @@
-{"name": "drifloon", "types": ["flying", "ghost"], "stats": {"speed": 70, "special-defense": 44, "special-attack": 60, "defense": 34, "attack": 50, "hp": 90}}
\ No newline at end of file
+{"name": "drifloon", "types": ["ghost", "flying"], "stats": {"hp": 90, "attack": 50, "defense": 34, "special-attack": 60, "special-defense": 44, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_426.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_426.json
index f3a9d4a..c47053d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_426.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_426.json
@@ -1,1 +1,1 @@
-{"name": "drifblim", "types": ["flying", "ghost"], "stats": {"speed": 80, "special-defense": 54, "special-attack": 90, "defense": 44, "attack": 80, "hp": 150}}
\ No newline at end of file
+{"name": "drifblim", "types": ["ghost", "flying"], "stats": {"hp": 150, "attack": 80, "defense": 44, "special-attack": 90, "special-defense": 54, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_427.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_427.json
index c417589..07f2fa6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_427.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_427.json
@@ -1,1 +1,1 @@
-{"name": "buneary", "types": ["normal"], "stats": {"speed": 85, "special-defense": 56, "special-attack": 44, "defense": 44, "attack": 66, "hp": 55}}
\ No newline at end of file
+{"name": "buneary", "types": ["normal"], "stats": {"hp": 55, "attack": 66, "defense": 44, "special-attack": 44, "special-defense": 56, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_428.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_428.json
index b344eca..63550ff 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_428.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_428.json
@@ -1,1 +1,1 @@
-{"name": "lopunny", "types": ["normal"], "stats": {"speed": 105, "special-defense": 96, "special-attack": 54, "defense": 84, "attack": 76, "hp": 65}}
\ No newline at end of file
+{"name": "lopunny", "types": ["normal"], "stats": {"hp": 65, "attack": 76, "defense": 84, "special-attack": 54, "special-defense": 96, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_429.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_429.json
index 49adcd1..b0eb5e6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_429.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_429.json
@@ -1,1 +1,1 @@
-{"name": "mismagius", "types": ["ghost"], "stats": {"speed": 105, "special-defense": 105, "special-attack": 105, "defense": 60, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "mismagius", "types": ["ghost"], "stats": {"hp": 60, "attack": 60, "defense": 60, "special-attack": 105, "special-defense": 105, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_43.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_43.json
index ea4c8fc..7496bdb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_43.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_43.json
@@ -1,1 +1,1 @@
-{"name": "oddish", "types": ["poison", "grass"], "stats": {"speed": 30, "special-defense": 65, "special-attack": 75, "defense": 55, "attack": 50, "hp": 45}}
\ No newline at end of file
+{"name": "oddish", "types": ["grass", "poison"], "stats": {"hp": 45, "attack": 50, "defense": 55, "special-attack": 75, "special-defense": 65, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_430.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_430.json
index f4d21f8..dbf88a2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_430.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_430.json
@@ -1,1 +1,1 @@
-{"name": "honchkrow", "types": ["flying", "dark"], "stats": {"speed": 71, "special-defense": 52, "special-attack": 105, "defense": 52, "attack": 125, "hp": 100}}
\ No newline at end of file
+{"name": "honchkrow", "types": ["dark", "flying"], "stats": {"hp": 100, "attack": 125, "defense": 52, "special-attack": 105, "special-defense": 52, "speed": 71}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_431.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_431.json
index b34df05..1df2e4a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_431.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_431.json
@@ -1,1 +1,1 @@
-{"name": "glameow", "types": ["normal"], "stats": {"speed": 85, "special-defense": 37, "special-attack": 42, "defense": 42, "attack": 55, "hp": 49}}
\ No newline at end of file
+{"name": "glameow", "types": ["normal"], "stats": {"hp": 49, "attack": 55, "defense": 42, "special-attack": 42, "special-defense": 37, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_432.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_432.json
index 1644e63..2cf890f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_432.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_432.json
@@ -1,1 +1,1 @@
-{"name": "purugly", "types": ["normal"], "stats": {"speed": 112, "special-defense": 59, "special-attack": 64, "defense": 64, "attack": 82, "hp": 71}}
\ No newline at end of file
+{"name": "purugly", "types": ["normal"], "stats": {"hp": 71, "attack": 82, "defense": 64, "special-attack": 64, "special-defense": 59, "speed": 112}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_433.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_433.json
index 282859a..5bec852 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_433.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_433.json
@@ -1,1 +1,1 @@
-{"name": "chingling", "types": ["psychic"], "stats": {"speed": 45, "special-defense": 50, "special-attack": 65, "defense": 50, "attack": 30, "hp": 45}}
\ No newline at end of file
+{"name": "chingling", "types": ["psychic"], "stats": {"hp": 45, "attack": 30, "defense": 50, "special-attack": 65, "special-defense": 50, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_434.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_434.json
index 5753882..8d00199 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_434.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_434.json
@@ -1,1 +1,1 @@
-{"name": "stunky", "types": ["dark", "poison"], "stats": {"speed": 74, "special-defense": 41, "special-attack": 41, "defense": 47, "attack": 63, "hp": 63}}
\ No newline at end of file
+{"name": "stunky", "types": ["poison", "dark"], "stats": {"hp": 63, "attack": 63, "defense": 47, "special-attack": 41, "special-defense": 41, "speed": 74}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_435.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_435.json
index 17ad8d1..f942419 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_435.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_435.json
@@ -1,1 +1,1 @@
-{"name": "skuntank", "types": ["dark", "poison"], "stats": {"speed": 84, "special-defense": 61, "special-attack": 71, "defense": 67, "attack": 93, "hp": 103}}
\ No newline at end of file
+{"name": "skuntank", "types": ["poison", "dark"], "stats": {"hp": 103, "attack": 93, "defense": 67, "special-attack": 71, "special-defense": 61, "speed": 84}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_436.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_436.json
index ccb7ce7..82a8584 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_436.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_436.json
@@ -1,1 +1,1 @@
-{"name": "bronzor", "types": ["psychic", "steel"], "stats": {"speed": 23, "special-defense": 86, "special-attack": 24, "defense": 86, "attack": 24, "hp": 57}}
\ No newline at end of file
+{"name": "bronzor", "types": ["steel", "psychic"], "stats": {"hp": 57, "attack": 24, "defense": 86, "special-attack": 24, "special-defense": 86, "speed": 23}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_437.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_437.json
index 3bd1e59..86c5688 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_437.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_437.json
@@ -1,1 +1,1 @@
-{"name": "bronzong", "types": ["psychic", "steel"], "stats": {"speed": 33, "special-defense": 116, "special-attack": 79, "defense": 116, "attack": 89, "hp": 67}}
\ No newline at end of file
+{"name": "bronzong", "types": ["steel", "psychic"], "stats": {"hp": 67, "attack": 89, "defense": 116, "special-attack": 79, "special-defense": 116, "speed": 33}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_438.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_438.json
index 2772c47..79b9736 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_438.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_438.json
@@ -1,1 +1,1 @@
-{"name": "bonsly", "types": ["rock"], "stats": {"speed": 10, "special-defense": 45, "special-attack": 10, "defense": 95, "attack": 80, "hp": 50}}
\ No newline at end of file
+{"name": "bonsly", "types": ["rock"], "stats": {"hp": 50, "attack": 80, "defense": 95, "special-attack": 10, "special-defense": 45, "speed": 10}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_439.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_439.json
index 637c0db..510d9ed 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_439.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_439.json
@@ -1,1 +1,1 @@
-{"name": "mime-jr", "types": ["fairy", "psychic"], "stats": {"speed": 60, "special-defense": 90, "special-attack": 70, "defense": 45, "attack": 25, "hp": 20}}
\ No newline at end of file
+{"name": "mime-jr", "types": ["psychic", "fairy"], "stats": {"hp": 20, "attack": 25, "defense": 45, "special-attack": 70, "special-defense": 90, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_44.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_44.json
index 91fcdb2..b6f25f6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_44.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_44.json
@@ -1,1 +1,1 @@
-{"name": "gloom", "types": ["poison", "grass"], "stats": {"speed": 40, "special-defense": 75, "special-attack": 85, "defense": 70, "attack": 65, "hp": 60}}
\ No newline at end of file
+{"name": "gloom", "types": ["grass", "poison"], "stats": {"hp": 60, "attack": 65, "defense": 70, "special-attack": 85, "special-defense": 75, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_440.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_440.json
index 8d2360a..24e0c19 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_440.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_440.json
@@ -1,1 +1,1 @@
-{"name": "happiny", "types": ["normal"], "stats": {"speed": 30, "special-defense": 65, "special-attack": 15, "defense": 5, "attack": 5, "hp": 100}}
\ No newline at end of file
+{"name": "happiny", "types": ["normal"], "stats": {"hp": 100, "attack": 5, "defense": 5, "special-attack": 15, "special-defense": 65, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_441.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_441.json
index 23e2213..4816b10 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_441.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_441.json
@@ -1,1 +1,1 @@
-{"name": "chatot", "types": ["flying", "normal"], "stats": {"speed": 91, "special-defense": 42, "special-attack": 92, "defense": 45, "attack": 65, "hp": 76}}
\ No newline at end of file
+{"name": "chatot", "types": ["normal", "flying"], "stats": {"hp": 76, "attack": 65, "defense": 45, "special-attack": 92, "special-defense": 42, "speed": 91}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_442.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_442.json
index 27c6bea..e428589 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_442.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_442.json
@@ -1,1 +1,1 @@
-{"name": "spiritomb", "types": ["dark", "ghost"], "stats": {"speed": 35, "special-defense": 108, "special-attack": 92, "defense": 108, "attack": 92, "hp": 50}}
\ No newline at end of file
+{"name": "spiritomb", "types": ["ghost", "dark"], "stats": {"hp": 50, "attack": 92, "defense": 108, "special-attack": 92, "special-defense": 108, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_443.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_443.json
index b92588a..5ec193b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_443.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_443.json
@@ -1,1 +1,1 @@
-{"name": "gible", "types": ["ground", "dragon"], "stats": {"speed": 42, "special-defense": 45, "special-attack": 40, "defense": 45, "attack": 70, "hp": 58}}
\ No newline at end of file
+{"name": "gible", "types": ["dragon", "ground"], "stats": {"hp": 58, "attack": 70, "defense": 45, "special-attack": 40, "special-defense": 45, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_444.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_444.json
index d6d8094..e8f435f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_444.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_444.json
@@ -1,1 +1,1 @@
-{"name": "gabite", "types": ["ground", "dragon"], "stats": {"speed": 82, "special-defense": 55, "special-attack": 50, "defense": 65, "attack": 90, "hp": 68}}
\ No newline at end of file
+{"name": "gabite", "types": ["dragon", "ground"], "stats": {"hp": 68, "attack": 90, "defense": 65, "special-attack": 50, "special-defense": 55, "speed": 82}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_445.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_445.json
index 7d731a2..daab458 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_445.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_445.json
@@ -1,1 +1,1 @@
-{"name": "garchomp", "types": ["ground", "dragon"], "stats": {"speed": 102, "special-defense": 85, "special-attack": 80, "defense": 95, "attack": 130, "hp": 108}}
\ No newline at end of file
+{"name": "garchomp", "types": ["dragon", "ground"], "stats": {"hp": 108, "attack": 130, "defense": 95, "special-attack": 80, "special-defense": 85, "speed": 102}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_446.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_446.json
index 3dcc40c..83c597d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_446.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_446.json
@@ -1,1 +1,1 @@
-{"name": "munchlax", "types": ["normal"], "stats": {"speed": 5, "special-defense": 85, "special-attack": 40, "defense": 40, "attack": 85, "hp": 135}}
\ No newline at end of file
+{"name": "munchlax", "types": ["normal"], "stats": {"hp": 135, "attack": 85, "defense": 40, "special-attack": 40, "special-defense": 85, "speed": 5}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_447.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_447.json
index c41eca4..31de8b5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_447.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_447.json
@@ -1,1 +1,1 @@
-{"name": "riolu", "types": ["fighting"], "stats": {"speed": 60, "special-defense": 40, "special-attack": 35, "defense": 40, "attack": 70, "hp": 40}}
\ No newline at end of file
+{"name": "riolu", "types": ["fighting"], "stats": {"hp": 40, "attack": 70, "defense": 40, "special-attack": 35, "special-defense": 40, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_448.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_448.json
index 04f5a1f..b144970 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_448.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_448.json
@@ -1,1 +1,1 @@
-{"name": "lucario", "types": ["steel", "fighting"], "stats": {"speed": 90, "special-defense": 70, "special-attack": 115, "defense": 70, "attack": 110, "hp": 70}}
\ No newline at end of file
+{"name": "lucario", "types": ["fighting", "steel"], "stats": {"hp": 70, "attack": 110, "defense": 70, "special-attack": 115, "special-defense": 70, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_449.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_449.json
index efb4010..4865ebb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_449.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_449.json
@@ -1,1 +1,1 @@
-{"name": "hippopotas", "types": ["ground"], "stats": {"speed": 32, "special-defense": 42, "special-attack": 38, "defense": 78, "attack": 72, "hp": 68}}
\ No newline at end of file
+{"name": "hippopotas", "types": ["ground"], "stats": {"hp": 68, "attack": 72, "defense": 78, "special-attack": 38, "special-defense": 42, "speed": 32}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_45.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_45.json
index b8fb03d..8b89ba1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_45.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_45.json
@@ -1,1 +1,1 @@
-{"name": "vileplume", "types": ["poison", "grass"], "stats": {"speed": 50, "special-defense": 90, "special-attack": 110, "defense": 85, "attack": 80, "hp": 75}}
\ No newline at end of file
+{"name": "vileplume", "types": ["grass", "poison"], "stats": {"hp": 75, "attack": 80, "defense": 85, "special-attack": 110, "special-defense": 90, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_450.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_450.json
index 392ffff..1f97c43 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_450.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_450.json
@@ -1,1 +1,1 @@
-{"name": "hippowdon", "types": ["ground"], "stats": {"speed": 47, "special-defense": 72, "special-attack": 68, "defense": 118, "attack": 112, "hp": 108}}
\ No newline at end of file
+{"name": "hippowdon", "types": ["ground"], "stats": {"hp": 108, "attack": 112, "defense": 118, "special-attack": 68, "special-defense": 72, "speed": 47}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_451.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_451.json
index 7ac1cf4..07cf51d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_451.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_451.json
@@ -1,1 +1,1 @@
-{"name": "skorupi", "types": ["bug", "poison"], "stats": {"speed": 65, "special-defense": 55, "special-attack": 30, "defense": 90, "attack": 50, "hp": 40}}
\ No newline at end of file
+{"name": "skorupi", "types": ["poison", "bug"], "stats": {"hp": 40, "attack": 50, "defense": 90, "special-attack": 30, "special-defense": 55, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_452.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_452.json
index ad3e055..b8efa72 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_452.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_452.json
@@ -1,1 +1,1 @@
-{"name": "drapion", "types": ["dark", "poison"], "stats": {"speed": 95, "special-defense": 75, "special-attack": 60, "defense": 110, "attack": 90, "hp": 70}}
\ No newline at end of file
+{"name": "drapion", "types": ["poison", "dark"], "stats": {"hp": 70, "attack": 90, "defense": 110, "special-attack": 60, "special-defense": 75, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_453.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_453.json
index 9e4182e..c9f0af1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_453.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_453.json
@@ -1,1 +1,1 @@
-{"name": "croagunk", "types": ["fighting", "poison"], "stats": {"speed": 50, "special-defense": 40, "special-attack": 61, "defense": 40, "attack": 61, "hp": 48}}
\ No newline at end of file
+{"name": "croagunk", "types": ["poison", "fighting"], "stats": {"hp": 48, "attack": 61, "defense": 40, "special-attack": 61, "special-defense": 40, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_454.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_454.json
index f649bc6..252ca5d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_454.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_454.json
@@ -1,1 +1,1 @@
-{"name": "toxicroak", "types": ["fighting", "poison"], "stats": {"speed": 85, "special-defense": 65, "special-attack": 86, "defense": 65, "attack": 106, "hp": 83}}
\ No newline at end of file
+{"name": "toxicroak", "types": ["poison", "fighting"], "stats": {"hp": 83, "attack": 106, "defense": 65, "special-attack": 86, "special-defense": 65, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_455.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_455.json
index 7776f72..f931995 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_455.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_455.json
@@ -1,1 +1,1 @@
-{"name": "carnivine", "types": ["grass"], "stats": {"speed": 46, "special-defense": 72, "special-attack": 90, "defense": 72, "attack": 100, "hp": 74}}
\ No newline at end of file
+{"name": "carnivine", "types": ["grass"], "stats": {"hp": 74, "attack": 100, "defense": 72, "special-attack": 90, "special-defense": 72, "speed": 46}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_456.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_456.json
index fe49634..bcde397 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_456.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_456.json
@@ -1,1 +1,1 @@
-{"name": "finneon", "types": ["water"], "stats": {"speed": 66, "special-defense": 61, "special-attack": 49, "defense": 56, "attack": 49, "hp": 49}}
\ No newline at end of file
+{"name": "finneon", "types": ["water"], "stats": {"hp": 49, "attack": 49, "defense": 56, "special-attack": 49, "special-defense": 61, "speed": 66}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_457.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_457.json
index 2fa2490..7b04a1c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_457.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_457.json
@@ -1,1 +1,1 @@
-{"name": "lumineon", "types": ["water"], "stats": {"speed": 91, "special-defense": 86, "special-attack": 69, "defense": 76, "attack": 69, "hp": 69}}
\ No newline at end of file
+{"name": "lumineon", "types": ["water"], "stats": {"hp": 69, "attack": 69, "defense": 76, "special-attack": 69, "special-defense": 86, "speed": 91}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_458.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_458.json
index 695563c..9e1e4e1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_458.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_458.json
@@ -1,1 +1,1 @@
-{"name": "mantyke", "types": ["flying", "water"], "stats": {"speed": 50, "special-defense": 120, "special-attack": 60, "defense": 50, "attack": 20, "hp": 45}}
\ No newline at end of file
+{"name": "mantyke", "types": ["water", "flying"], "stats": {"hp": 45, "attack": 20, "defense": 50, "special-attack": 60, "special-defense": 120, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_459.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_459.json
index a7c8076..63d898c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_459.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_459.json
@@ -1,1 +1,1 @@
-{"name": "snover", "types": ["ice", "grass"], "stats": {"speed": 40, "special-defense": 60, "special-attack": 62, "defense": 50, "attack": 62, "hp": 60}}
\ No newline at end of file
+{"name": "snover", "types": ["grass", "ice"], "stats": {"hp": 60, "attack": 62, "defense": 50, "special-attack": 62, "special-defense": 60, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_46.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_46.json
index f2a6157..78e12ad 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_46.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_46.json
@@ -1,1 +1,1 @@
-{"name": "paras", "types": ["grass", "bug"], "stats": {"speed": 25, "special-defense": 55, "special-attack": 45, "defense": 55, "attack": 70, "hp": 35}}
\ No newline at end of file
+{"name": "paras", "types": ["bug", "grass"], "stats": {"hp": 35, "attack": 70, "defense": 55, "special-attack": 45, "special-defense": 55, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_460.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_460.json
index 195433b..7922b60 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_460.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_460.json
@@ -1,1 +1,1 @@
-{"name": "abomasnow", "types": ["ice", "grass"], "stats": {"speed": 60, "special-defense": 85, "special-attack": 92, "defense": 75, "attack": 92, "hp": 90}}
\ No newline at end of file
+{"name": "abomasnow", "types": ["grass", "ice"], "stats": {"hp": 90, "attack": 92, "defense": 75, "special-attack": 92, "special-defense": 85, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_461.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_461.json
index 6689e41..6791fd3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_461.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_461.json
@@ -1,1 +1,1 @@
-{"name": "weavile", "types": ["ice", "dark"], "stats": {"speed": 125, "special-defense": 85, "special-attack": 45, "defense": 65, "attack": 120, "hp": 70}}
\ No newline at end of file
+{"name": "weavile", "types": ["dark", "ice"], "stats": {"hp": 70, "attack": 120, "defense": 65, "special-attack": 45, "special-defense": 85, "speed": 125}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_462.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_462.json
index 28067f4..c72acef 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_462.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_462.json
@@ -1,1 +1,1 @@
-{"name": "magnezone", "types": ["steel", "electric"], "stats": {"speed": 60, "special-defense": 90, "special-attack": 130, "defense": 115, "attack": 70, "hp": 70}}
\ No newline at end of file
+{"name": "magnezone", "types": ["electric", "steel"], "stats": {"hp": 70, "attack": 70, "defense": 115, "special-attack": 130, "special-defense": 90, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_463.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_463.json
index 9e2439f..eabf746 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_463.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_463.json
@@ -1,1 +1,1 @@
-{"name": "lickilicky", "types": ["normal"], "stats": {"speed": 50, "special-defense": 95, "special-attack": 80, "defense": 95, "attack": 85, "hp": 110}}
\ No newline at end of file
+{"name": "lickilicky", "types": ["normal"], "stats": {"hp": 110, "attack": 85, "defense": 95, "special-attack": 80, "special-defense": 95, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_464.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_464.json
index 978f8e3..8530502 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_464.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_464.json
@@ -1,1 +1,1 @@
-{"name": "rhyperior", "types": ["rock", "ground"], "stats": {"speed": 40, "special-defense": 55, "special-attack": 55, "defense": 130, "attack": 140, "hp": 115}}
\ No newline at end of file
+{"name": "rhyperior", "types": ["ground", "rock"], "stats": {"hp": 115, "attack": 140, "defense": 130, "special-attack": 55, "special-defense": 55, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_465.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_465.json
index 9218bd0..4dc66ab 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_465.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_465.json
@@ -1,1 +1,1 @@
-{"name": "tangrowth", "types": ["grass"], "stats": {"speed": 50, "special-defense": 50, "special-attack": 110, "defense": 125, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "tangrowth", "types": ["grass"], "stats": {"hp": 100, "attack": 100, "defense": 125, "special-attack": 110, "special-defense": 50, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_466.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_466.json
index 71862ac..5d7fc54 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_466.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_466.json
@@ -1,1 +1,1 @@
-{"name": "electivire", "types": ["electric"], "stats": {"speed": 95, "special-defense": 85, "special-attack": 95, "defense": 67, "attack": 123, "hp": 75}}
\ No newline at end of file
+{"name": "electivire", "types": ["electric"], "stats": {"hp": 75, "attack": 123, "defense": 67, "special-attack": 95, "special-defense": 85, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_467.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_467.json
index 2399189..bea6362 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_467.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_467.json
@@ -1,1 +1,1 @@
-{"name": "magmortar", "types": ["fire"], "stats": {"speed": 83, "special-defense": 95, "special-attack": 125, "defense": 67, "attack": 95, "hp": 75}}
\ No newline at end of file
+{"name": "magmortar", "types": ["fire"], "stats": {"hp": 75, "attack": 95, "defense": 67, "special-attack": 125, "special-defense": 95, "speed": 83}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_468.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_468.json
index 033dcc3..f5f6611 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_468.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_468.json
@@ -1,1 +1,1 @@
-{"name": "togekiss", "types": ["flying", "fairy"], "stats": {"speed": 80, "special-defense": 115, "special-attack": 120, "defense": 95, "attack": 50, "hp": 85}}
\ No newline at end of file
+{"name": "togekiss", "types": ["fairy", "flying"], "stats": {"hp": 85, "attack": 50, "defense": 95, "special-attack": 120, "special-defense": 115, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_469.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_469.json
index a3e226c..3c421be 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_469.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_469.json
@@ -1,1 +1,1 @@
-{"name": "yanmega", "types": ["flying", "bug"], "stats": {"speed": 95, "special-defense": 56, "special-attack": 116, "defense": 86, "attack": 76, "hp": 86}}
\ No newline at end of file
+{"name": "yanmega", "types": ["bug", "flying"], "stats": {"hp": 86, "attack": 76, "defense": 86, "special-attack": 116, "special-defense": 56, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_47.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_47.json
index 987bdb6..50673d2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_47.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_47.json
@@ -1,1 +1,1 @@
-{"name": "parasect", "types": ["grass", "bug"], "stats": {"speed": 30, "special-defense": 80, "special-attack": 60, "defense": 80, "attack": 95, "hp": 60}}
\ No newline at end of file
+{"name": "parasect", "types": ["bug", "grass"], "stats": {"hp": 60, "attack": 95, "defense": 80, "special-attack": 60, "special-defense": 80, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_470.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_470.json
index a7b85f3..0ce56f8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_470.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_470.json
@@ -1,1 +1,1 @@
-{"name": "leafeon", "types": ["grass"], "stats": {"speed": 95, "special-defense": 65, "special-attack": 60, "defense": 130, "attack": 110, "hp": 65}}
\ No newline at end of file
+{"name": "leafeon", "types": ["grass"], "stats": {"hp": 65, "attack": 110, "defense": 130, "special-attack": 60, "special-defense": 65, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_471.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_471.json
index 932be00..69aaf04 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_471.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_471.json
@@ -1,1 +1,1 @@
-{"name": "glaceon", "types": ["ice"], "stats": {"speed": 65, "special-defense": 95, "special-attack": 130, "defense": 110, "attack": 60, "hp": 65}}
\ No newline at end of file
+{"name": "glaceon", "types": ["ice"], "stats": {"hp": 65, "attack": 60, "defense": 110, "special-attack": 130, "special-defense": 95, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_472.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_472.json
index 9402772..bd7cad4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_472.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_472.json
@@ -1,1 +1,1 @@
-{"name": "gliscor", "types": ["flying", "ground"], "stats": {"speed": 95, "special-defense": 75, "special-attack": 45, "defense": 125, "attack": 95, "hp": 75}}
\ No newline at end of file
+{"name": "gliscor", "types": ["ground", "flying"], "stats": {"hp": 75, "attack": 95, "defense": 125, "special-attack": 45, "special-defense": 75, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_473.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_473.json
index 3dbb98f..a54d8aa 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_473.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_473.json
@@ -1,1 +1,1 @@
-{"name": "mamoswine", "types": ["ground", "ice"], "stats": {"speed": 80, "special-defense": 60, "special-attack": 70, "defense": 80, "attack": 130, "hp": 110}}
\ No newline at end of file
+{"name": "mamoswine", "types": ["ice", "ground"], "stats": {"hp": 110, "attack": 130, "defense": 80, "special-attack": 70, "special-defense": 60, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_474.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_474.json
index 84d2764..279fa2b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_474.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_474.json
@@ -1,1 +1,1 @@
-{"name": "porygon-z", "types": ["normal"], "stats": {"speed": 90, "special-defense": 75, "special-attack": 135, "defense": 70, "attack": 80, "hp": 85}}
\ No newline at end of file
+{"name": "porygon-z", "types": ["normal"], "stats": {"hp": 85, "attack": 80, "defense": 70, "special-attack": 135, "special-defense": 75, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_475.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_475.json
index 0bf9017..bf6b48e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_475.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_475.json
@@ -1,1 +1,1 @@
-{"name": "gallade", "types": ["fighting", "psychic"], "stats": {"speed": 80, "special-defense": 115, "special-attack": 65, "defense": 65, "attack": 125, "hp": 68}}
\ No newline at end of file
+{"name": "gallade", "types": ["psychic", "fighting"], "stats": {"hp": 68, "attack": 125, "defense": 65, "special-attack": 65, "special-defense": 115, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_476.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_476.json
index 4feb7c0..d5f590a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_476.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_476.json
@@ -1,1 +1,1 @@
-{"name": "probopass", "types": ["steel", "rock"], "stats": {"speed": 40, "special-defense": 150, "special-attack": 75, "defense": 145, "attack": 55, "hp": 60}}
\ No newline at end of file
+{"name": "probopass", "types": ["rock", "steel"], "stats": {"hp": 60, "attack": 55, "defense": 145, "special-attack": 75, "special-defense": 150, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_477.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_477.json
index df84b75..7e9db6b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_477.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_477.json
@@ -1,1 +1,1 @@
-{"name": "dusknoir", "types": ["ghost"], "stats": {"speed": 45, "special-defense": 135, "special-attack": 65, "defense": 135, "attack": 100, "hp": 45}}
\ No newline at end of file
+{"name": "dusknoir", "types": ["ghost"], "stats": {"hp": 45, "attack": 100, "defense": 135, "special-attack": 65, "special-defense": 135, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_478.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_478.json
index 9528606..e425027 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_478.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_478.json
@@ -1,1 +1,1 @@
-{"name": "froslass", "types": ["ghost", "ice"], "stats": {"speed": 110, "special-defense": 70, "special-attack": 80, "defense": 70, "attack": 80, "hp": 70}}
\ No newline at end of file
+{"name": "froslass", "types": ["ice", "ghost"], "stats": {"hp": 70, "attack": 80, "defense": 70, "special-attack": 80, "special-defense": 70, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_479.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_479.json
index f4f93b7..91e076c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_479.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_479.json
@@ -1,1 +1,1 @@
-{"name": "rotom", "types": ["ghost", "electric"], "stats": {"speed": 91, "special-defense": 77, "special-attack": 95, "defense": 77, "attack": 50, "hp": 50}}
\ No newline at end of file
+{"name": "rotom", "types": ["electric", "ghost"], "stats": {"hp": 50, "attack": 50, "defense": 77, "special-attack": 95, "special-defense": 77, "speed": 91}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_48.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_48.json
index 79682d4..141702e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_48.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_48.json
@@ -1,1 +1,1 @@
-{"name": "venonat", "types": ["poison", "bug"], "stats": {"speed": 45, "special-defense": 55, "special-attack": 40, "defense": 50, "attack": 55, "hp": 60}}
\ No newline at end of file
+{"name": "venonat", "types": ["bug", "poison"], "stats": {"hp": 60, "attack": 55, "defense": 50, "special-attack": 40, "special-defense": 55, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_480.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_480.json
index a60adde..4cf4aba 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_480.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_480.json
@@ -1,1 +1,1 @@
-{"name": "uxie", "types": ["psychic"], "stats": {"speed": 95, "special-defense": 130, "special-attack": 75, "defense": 130, "attack": 75, "hp": 75}}
\ No newline at end of file
+{"name": "uxie", "types": ["psychic"], "stats": {"hp": 75, "attack": 75, "defense": 130, "special-attack": 75, "special-defense": 130, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_481.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_481.json
index 8155fc4..67f25ab 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_481.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_481.json
@@ -1,1 +1,1 @@
-{"name": "mesprit", "types": ["psychic"], "stats": {"speed": 80, "special-defense": 105, "special-attack": 105, "defense": 105, "attack": 105, "hp": 80}}
\ No newline at end of file
+{"name": "mesprit", "types": ["psychic"], "stats": {"hp": 80, "attack": 105, "defense": 105, "special-attack": 105, "special-defense": 105, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_482.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_482.json
index 02a8e13..9d2a4c9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_482.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_482.json
@@ -1,1 +1,1 @@
-{"name": "azelf", "types": ["psychic"], "stats": {"speed": 115, "special-defense": 70, "special-attack": 125, "defense": 70, "attack": 125, "hp": 75}}
\ No newline at end of file
+{"name": "azelf", "types": ["psychic"], "stats": {"hp": 75, "attack": 125, "defense": 70, "special-attack": 125, "special-defense": 70, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_483.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_483.json
index 4d8b794..2e6583d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_483.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_483.json
@@ -1,1 +1,1 @@
-{"name": "dialga", "types": ["dragon", "steel"], "stats": {"speed": 90, "special-defense": 100, "special-attack": 150, "defense": 120, "attack": 120, "hp": 100}}
\ No newline at end of file
+{"name": "dialga", "types": ["steel", "dragon"], "stats": {"hp": 100, "attack": 120, "defense": 120, "special-attack": 150, "special-defense": 100, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_484.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_484.json
index a0b4d59..c78fee9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_484.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_484.json
@@ -1,1 +1,1 @@
-{"name": "palkia", "types": ["dragon", "water"], "stats": {"speed": 100, "special-defense": 120, "special-attack": 150, "defense": 100, "attack": 120, "hp": 90}}
\ No newline at end of file
+{"name": "palkia", "types": ["water", "dragon"], "stats": {"hp": 90, "attack": 120, "defense": 100, "special-attack": 150, "special-defense": 120, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_485.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_485.json
index effa4f7..98a79d1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_485.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_485.json
@@ -1,1 +1,1 @@
-{"name": "heatran", "types": ["steel", "fire"], "stats": {"speed": 77, "special-defense": 106, "special-attack": 130, "defense": 106, "attack": 90, "hp": 91}}
\ No newline at end of file
+{"name": "heatran", "types": ["fire", "steel"], "stats": {"hp": 91, "attack": 90, "defense": 106, "special-attack": 130, "special-defense": 106, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_486.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_486.json
index ba51a64..0b23675 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_486.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_486.json
@@ -1,1 +1,1 @@
-{"name": "regigigas", "types": ["normal"], "stats": {"speed": 100, "special-defense": 110, "special-attack": 80, "defense": 110, "attack": 160, "hp": 110}}
\ No newline at end of file
+{"name": "regigigas", "types": ["normal"], "stats": {"hp": 110, "attack": 160, "defense": 110, "special-attack": 80, "special-defense": 110, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_487.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_487.json
index 9327b75..3612657 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_487.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_487.json
@@ -1,1 +1,1 @@
-{"name": "giratina-altered", "types": ["dragon", "ghost"], "stats": {"speed": 90, "special-defense": 120, "special-attack": 100, "defense": 120, "attack": 100, "hp": 150}}
\ No newline at end of file
+{"name": "giratina-altered", "types": ["ghost", "dragon"], "stats": {"hp": 150, "attack": 100, "defense": 120, "special-attack": 100, "special-defense": 120, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_488.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_488.json
index e31b623..0454000 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_488.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_488.json
@@ -1,1 +1,1 @@
-{"name": "cresselia", "types": ["psychic"], "stats": {"speed": 85, "special-defense": 130, "special-attack": 75, "defense": 120, "attack": 70, "hp": 120}}
\ No newline at end of file
+{"name": "cresselia", "types": ["psychic"], "stats": {"hp": 120, "attack": 70, "defense": 120, "special-attack": 75, "special-defense": 130, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_489.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_489.json
index f5bd9d0..a8c21fe 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_489.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_489.json
@@ -1,1 +1,1 @@
-{"name": "phione", "types": ["water"], "stats": {"speed": 80, "special-defense": 80, "special-attack": 80, "defense": 80, "attack": 80, "hp": 80}}
\ No newline at end of file
+{"name": "phione", "types": ["water"], "stats": {"hp": 80, "attack": 80, "defense": 80, "special-attack": 80, "special-defense": 80, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_49.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_49.json
index 47f3407..9faecb3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_49.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_49.json
@@ -1,1 +1,1 @@
-{"name": "venomoth", "types": ["poison", "bug"], "stats": {"speed": 90, "special-defense": 75, "special-attack": 90, "defense": 60, "attack": 65, "hp": 70}}
\ No newline at end of file
+{"name": "venomoth", "types": ["bug", "poison"], "stats": {"hp": 70, "attack": 65, "defense": 60, "special-attack": 90, "special-defense": 75, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_490.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_490.json
index 37d8483..cff1c20 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_490.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_490.json
@@ -1,1 +1,1 @@
-{"name": "manaphy", "types": ["water"], "stats": {"speed": 100, "special-defense": 100, "special-attack": 100, "defense": 100, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "manaphy", "types": ["water"], "stats": {"hp": 100, "attack": 100, "defense": 100, "special-attack": 100, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_491.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_491.json
index 9d05a53..3054c12 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_491.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_491.json
@@ -1,1 +1,1 @@
-{"name": "darkrai", "types": ["dark"], "stats": {"speed": 125, "special-defense": 90, "special-attack": 135, "defense": 90, "attack": 90, "hp": 70}}
\ No newline at end of file
+{"name": "darkrai", "types": ["dark"], "stats": {"hp": 70, "attack": 90, "defense": 90, "special-attack": 135, "special-defense": 90, "speed": 125}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_492.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_492.json
index fe9bb8d..6d7313b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_492.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_492.json
@@ -1,1 +1,1 @@
-{"name": "shaymin-land", "types": ["grass"], "stats": {"speed": 100, "special-defense": 100, "special-attack": 100, "defense": 100, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "shaymin-land", "types": ["grass"], "stats": {"hp": 100, "attack": 100, "defense": 100, "special-attack": 100, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_493.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_493.json
index fae3425..b07a0e5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_493.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_493.json
@@ -1,1 +1,1 @@
-{"name": "arceus", "types": ["normal"], "stats": {"speed": 120, "special-defense": 120, "special-attack": 120, "defense": 120, "attack": 120, "hp": 120}}
\ No newline at end of file
+{"name": "arceus", "types": ["normal"], "stats": {"hp": 120, "attack": 120, "defense": 120, "special-attack": 120, "special-defense": 120, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_494.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_494.json
index 64c44e7..4b83e4f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_494.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_494.json
@@ -1,1 +1,1 @@
-{"name": "victini", "types": ["fire", "psychic"], "stats": {"speed": 100, "special-defense": 100, "special-attack": 100, "defense": 100, "attack": 100, "hp": 100}}
\ No newline at end of file
+{"name": "victini", "types": ["psychic", "fire"], "stats": {"hp": 100, "attack": 100, "defense": 100, "special-attack": 100, "special-defense": 100, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_495.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_495.json
index c41e71a..963dc08 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_495.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_495.json
@@ -1,1 +1,1 @@
-{"name": "snivy", "types": ["grass"], "stats": {"speed": 63, "special-defense": 55, "special-attack": 45, "defense": 55, "attack": 45, "hp": 45}}
\ No newline at end of file
+{"name": "snivy", "types": ["grass"], "stats": {"hp": 45, "attack": 45, "defense": 55, "special-attack": 45, "special-defense": 55, "speed": 63}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_496.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_496.json
index 9a892c1..f203775 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_496.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_496.json
@@ -1,1 +1,1 @@
-{"name": "servine", "types": ["grass"], "stats": {"speed": 83, "special-defense": 75, "special-attack": 60, "defense": 75, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "servine", "types": ["grass"], "stats": {"hp": 60, "attack": 60, "defense": 75, "special-attack": 60, "special-defense": 75, "speed": 83}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_497.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_497.json
index 1c69a0f..a65f664 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_497.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_497.json
@@ -1,1 +1,1 @@
-{"name": "serperior", "types": ["grass"], "stats": {"speed": 113, "special-defense": 95, "special-attack": 75, "defense": 95, "attack": 75, "hp": 75}}
\ No newline at end of file
+{"name": "serperior", "types": ["grass"], "stats": {"hp": 75, "attack": 75, "defense": 95, "special-attack": 75, "special-defense": 95, "speed": 113}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_498.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_498.json
index 0c17b95..0b1f3bc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_498.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_498.json
@@ -1,1 +1,1 @@
-{"name": "tepig", "types": ["fire"], "stats": {"speed": 45, "special-defense": 45, "special-attack": 45, "defense": 45, "attack": 63, "hp": 65}}
\ No newline at end of file
+{"name": "tepig", "types": ["fire"], "stats": {"hp": 65, "attack": 63, "defense": 45, "special-attack": 45, "special-defense": 45, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_499.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_499.json
index 26d5f39..85f4aa3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_499.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_499.json
@@ -1,1 +1,1 @@
-{"name": "pignite", "types": ["fighting", "fire"], "stats": {"speed": 55, "special-defense": 55, "special-attack": 70, "defense": 55, "attack": 93, "hp": 90}}
\ No newline at end of file
+{"name": "pignite", "types": ["fire", "fighting"], "stats": {"hp": 90, "attack": 93, "defense": 55, "special-attack": 70, "special-defense": 55, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_5.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_5.json
index 3f6c988..775829d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_5.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_5.json
@@ -1,1 +1,1 @@
-{"name": "charmeleon", "types": ["fire"], "stats": {"speed": 80, "special-defense": 65, "special-attack": 80, "defense": 58, "attack": 64, "hp": 58}}
\ No newline at end of file
+{"name": "charmeleon", "types": ["fire"], "stats": {"hp": 58, "attack": 64, "defense": 58, "special-attack": 80, "special-defense": 65, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_50.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_50.json
index d6777a3..7591cde 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_50.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_50.json
@@ -1,1 +1,1 @@
-{"name": "diglett", "types": ["ground"], "stats": {"speed": 95, "special-defense": 45, "special-attack": 35, "defense": 25, "attack": 55, "hp": 10}}
\ No newline at end of file
+{"name": "diglett", "types": ["ground"], "stats": {"hp": 10, "attack": 55, "defense": 25, "special-attack": 35, "special-defense": 45, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_500.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_500.json
index 39fc7a3..118bd52 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_500.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_500.json
@@ -1,1 +1,1 @@
-{"name": "emboar", "types": ["fighting", "fire"], "stats": {"speed": 65, "special-defense": 65, "special-attack": 100, "defense": 65, "attack": 123, "hp": 110}}
\ No newline at end of file
+{"name": "emboar", "types": ["fire", "fighting"], "stats": {"hp": 110, "attack": 123, "defense": 65, "special-attack": 100, "special-defense": 65, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_501.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_501.json
index 18247b2..9f7e984 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_501.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_501.json
@@ -1,1 +1,1 @@
-{"name": "oshawott", "types": ["water"], "stats": {"speed": 45, "special-defense": 45, "special-attack": 63, "defense": 45, "attack": 55, "hp": 55}}
\ No newline at end of file
+{"name": "oshawott", "types": ["water"], "stats": {"hp": 55, "attack": 55, "defense": 45, "special-attack": 63, "special-defense": 45, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_502.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_502.json
index fe215d3..eb26c88 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_502.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_502.json
@@ -1,1 +1,1 @@
-{"name": "dewott", "types": ["water"], "stats": {"speed": 60, "special-defense": 60, "special-attack": 83, "defense": 60, "attack": 75, "hp": 75}}
\ No newline at end of file
+{"name": "dewott", "types": ["water"], "stats": {"hp": 75, "attack": 75, "defense": 60, "special-attack": 83, "special-defense": 60, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_503.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_503.json
index fa86cef..e0001cb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_503.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_503.json
@@ -1,1 +1,1 @@
-{"name": "samurott", "types": ["water"], "stats": {"speed": 70, "special-defense": 70, "special-attack": 108, "defense": 85, "attack": 100, "hp": 95}}
\ No newline at end of file
+{"name": "samurott", "types": ["water"], "stats": {"hp": 95, "attack": 100, "defense": 85, "special-attack": 108, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_504.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_504.json
index 2cac0fc..d454219 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_504.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_504.json
@@ -1,1 +1,1 @@
-{"name": "patrat", "types": ["normal"], "stats": {"speed": 42, "special-defense": 39, "special-attack": 35, "defense": 39, "attack": 55, "hp": 45}}
\ No newline at end of file
+{"name": "patrat", "types": ["normal"], "stats": {"hp": 45, "attack": 55, "defense": 39, "special-attack": 35, "special-defense": 39, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_505.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_505.json
index 458c667..0032f4e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_505.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_505.json
@@ -1,1 +1,1 @@
-{"name": "watchog", "types": ["normal"], "stats": {"speed": 77, "special-defense": 69, "special-attack": 60, "defense": 69, "attack": 85, "hp": 60}}
\ No newline at end of file
+{"name": "watchog", "types": ["normal"], "stats": {"hp": 60, "attack": 85, "defense": 69, "special-attack": 60, "special-defense": 69, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_506.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_506.json
index 9bb5187..e538956 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_506.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_506.json
@@ -1,1 +1,1 @@
-{"name": "lillipup", "types": ["normal"], "stats": {"speed": 55, "special-defense": 45, "special-attack": 25, "defense": 45, "attack": 60, "hp": 45}}
\ No newline at end of file
+{"name": "lillipup", "types": ["normal"], "stats": {"hp": 45, "attack": 60, "defense": 45, "special-attack": 25, "special-defense": 45, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_507.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_507.json
index 241a980..ab360e8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_507.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_507.json
@@ -1,1 +1,1 @@
-{"name": "herdier", "types": ["normal"], "stats": {"speed": 60, "special-defense": 65, "special-attack": 35, "defense": 65, "attack": 80, "hp": 65}}
\ No newline at end of file
+{"name": "herdier", "types": ["normal"], "stats": {"hp": 65, "attack": 80, "defense": 65, "special-attack": 35, "special-defense": 65, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_508.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_508.json
index 2d4c4e3..61e2aaa 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_508.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_508.json
@@ -1,1 +1,1 @@
-{"name": "stoutland", "types": ["normal"], "stats": {"speed": 80, "special-defense": 90, "special-attack": 45, "defense": 90, "attack": 110, "hp": 85}}
\ No newline at end of file
+{"name": "stoutland", "types": ["normal"], "stats": {"hp": 85, "attack": 110, "defense": 90, "special-attack": 45, "special-defense": 90, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_509.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_509.json
index 850f4eb..db4cc91 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_509.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_509.json
@@ -1,1 +1,1 @@
-{"name": "purrloin", "types": ["dark"], "stats": {"speed": 66, "special-defense": 37, "special-attack": 50, "defense": 37, "attack": 50, "hp": 41}}
\ No newline at end of file
+{"name": "purrloin", "types": ["dark"], "stats": {"hp": 41, "attack": 50, "defense": 37, "special-attack": 50, "special-defense": 37, "speed": 66}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_51.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_51.json
index 0abd283..cefdc04 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_51.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_51.json
@@ -1,1 +1,1 @@
-{"name": "dugtrio", "types": ["ground"], "stats": {"speed": 120, "special-defense": 70, "special-attack": 50, "defense": 50, "attack": 100, "hp": 35}}
\ No newline at end of file
+{"name": "dugtrio", "types": ["ground"], "stats": {"hp": 35, "attack": 100, "defense": 50, "special-attack": 50, "special-defense": 70, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_510.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_510.json
index 72d9f6b..8a7f208 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_510.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_510.json
@@ -1,1 +1,1 @@
-{"name": "liepard", "types": ["dark"], "stats": {"speed": 106, "special-defense": 50, "special-attack": 88, "defense": 50, "attack": 88, "hp": 64}}
\ No newline at end of file
+{"name": "liepard", "types": ["dark"], "stats": {"hp": 64, "attack": 88, "defense": 50, "special-attack": 88, "special-defense": 50, "speed": 106}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_511.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_511.json
index cd65d36..c3590ff 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_511.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_511.json
@@ -1,1 +1,1 @@
-{"name": "pansage", "types": ["grass"], "stats": {"speed": 64, "special-defense": 48, "special-attack": 53, "defense": 48, "attack": 53, "hp": 50}}
\ No newline at end of file
+{"name": "pansage", "types": ["grass"], "stats": {"hp": 50, "attack": 53, "defense": 48, "special-attack": 53, "special-defense": 48, "speed": 64}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_512.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_512.json
index ad0882f..c702daa 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_512.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_512.json
@@ -1,1 +1,1 @@
-{"name": "simisage", "types": ["grass"], "stats": {"speed": 101, "special-defense": 63, "special-attack": 98, "defense": 63, "attack": 98, "hp": 75}}
\ No newline at end of file
+{"name": "simisage", "types": ["grass"], "stats": {"hp": 75, "attack": 98, "defense": 63, "special-attack": 98, "special-defense": 63, "speed": 101}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_513.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_513.json
index 11ea21f..5afb1bc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_513.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_513.json
@@ -1,1 +1,1 @@
-{"name": "pansear", "types": ["fire"], "stats": {"speed": 64, "special-defense": 48, "special-attack": 53, "defense": 48, "attack": 53, "hp": 50}}
\ No newline at end of file
+{"name": "pansear", "types": ["fire"], "stats": {"hp": 50, "attack": 53, "defense": 48, "special-attack": 53, "special-defense": 48, "speed": 64}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_514.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_514.json
index 30e2ffa..b43e102 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_514.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_514.json
@@ -1,1 +1,1 @@
-{"name": "simisear", "types": ["fire"], "stats": {"speed": 101, "special-defense": 63, "special-attack": 98, "defense": 63, "attack": 98, "hp": 75}}
\ No newline at end of file
+{"name": "simisear", "types": ["fire"], "stats": {"hp": 75, "attack": 98, "defense": 63, "special-attack": 98, "special-defense": 63, "speed": 101}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_515.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_515.json
index 9c8e6a0..4d61368 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_515.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_515.json
@@ -1,1 +1,1 @@
-{"name": "panpour", "types": ["water"], "stats": {"speed": 64, "special-defense": 48, "special-attack": 53, "defense": 48, "attack": 53, "hp": 50}}
\ No newline at end of file
+{"name": "panpour", "types": ["water"], "stats": {"hp": 50, "attack": 53, "defense": 48, "special-attack": 53, "special-defense": 48, "speed": 64}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_516.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_516.json
index 30d81a0..1c97652 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_516.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_516.json
@@ -1,1 +1,1 @@
-{"name": "simipour", "types": ["water"], "stats": {"speed": 101, "special-defense": 63, "special-attack": 98, "defense": 63, "attack": 98, "hp": 75}}
\ No newline at end of file
+{"name": "simipour", "types": ["water"], "stats": {"hp": 75, "attack": 98, "defense": 63, "special-attack": 98, "special-defense": 63, "speed": 101}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_517.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_517.json
index 7941511..e9955df 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_517.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_517.json
@@ -1,1 +1,1 @@
-{"name": "munna", "types": ["psychic"], "stats": {"speed": 24, "special-defense": 55, "special-attack": 67, "defense": 45, "attack": 25, "hp": 76}}
\ No newline at end of file
+{"name": "munna", "types": ["psychic"], "stats": {"hp": 76, "attack": 25, "defense": 45, "special-attack": 67, "special-defense": 55, "speed": 24}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_518.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_518.json
index e95278d..5b82894 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_518.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_518.json
@@ -1,1 +1,1 @@
-{"name": "musharna", "types": ["psychic"], "stats": {"speed": 29, "special-defense": 95, "special-attack": 107, "defense": 85, "attack": 55, "hp": 116}}
\ No newline at end of file
+{"name": "musharna", "types": ["psychic"], "stats": {"hp": 116, "attack": 55, "defense": 85, "special-attack": 107, "special-defense": 95, "speed": 29}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_519.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_519.json
index 1efc5c8..14cc844 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_519.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_519.json
@@ -1,1 +1,1 @@
-{"name": "pidove", "types": ["flying", "normal"], "stats": {"speed": 43, "special-defense": 30, "special-attack": 36, "defense": 50, "attack": 55, "hp": 50}}
\ No newline at end of file
+{"name": "pidove", "types": ["normal", "flying"], "stats": {"hp": 50, "attack": 55, "defense": 50, "special-attack": 36, "special-defense": 30, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_52.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_52.json
index f4afd36..3716169 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_52.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_52.json
@@ -1,1 +1,1 @@
-{"name": "meowth", "types": ["normal"], "stats": {"speed": 90, "special-defense": 40, "special-attack": 40, "defense": 35, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "meowth", "types": ["normal"], "stats": {"hp": 40, "attack": 45, "defense": 35, "special-attack": 40, "special-defense": 40, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_520.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_520.json
index 27a6ae7..40fd3d2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_520.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_520.json
@@ -1,1 +1,1 @@
-{"name": "tranquill", "types": ["flying", "normal"], "stats": {"speed": 65, "special-defense": 42, "special-attack": 50, "defense": 62, "attack": 77, "hp": 62}}
\ No newline at end of file
+{"name": "tranquill", "types": ["normal", "flying"], "stats": {"hp": 62, "attack": 77, "defense": 62, "special-attack": 50, "special-defense": 42, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_521.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_521.json
index e8d7834..ef7769a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_521.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_521.json
@@ -1,1 +1,1 @@
-{"name": "unfezant", "types": ["flying", "normal"], "stats": {"speed": 93, "special-defense": 55, "special-attack": 65, "defense": 80, "attack": 115, "hp": 80}}
\ No newline at end of file
+{"name": "unfezant", "types": ["normal", "flying"], "stats": {"hp": 80, "attack": 115, "defense": 80, "special-attack": 65, "special-defense": 55, "speed": 93}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_522.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_522.json
index 745a54f..5564375 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_522.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_522.json
@@ -1,1 +1,1 @@
-{"name": "blitzle", "types": ["electric"], "stats": {"speed": 76, "special-defense": 32, "special-attack": 50, "defense": 32, "attack": 60, "hp": 45}}
\ No newline at end of file
+{"name": "blitzle", "types": ["electric"], "stats": {"hp": 45, "attack": 60, "defense": 32, "special-attack": 50, "special-defense": 32, "speed": 76}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_523.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_523.json
index 72934f5..4f49fc1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_523.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_523.json
@@ -1,1 +1,1 @@
-{"name": "zebstrika", "types": ["electric"], "stats": {"speed": 116, "special-defense": 63, "special-attack": 80, "defense": 63, "attack": 100, "hp": 75}}
\ No newline at end of file
+{"name": "zebstrika", "types": ["electric"], "stats": {"hp": 75, "attack": 100, "defense": 63, "special-attack": 80, "special-defense": 63, "speed": 116}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_524.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_524.json
index 0a5e3a9..35b5149 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_524.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_524.json
@@ -1,1 +1,1 @@
-{"name": "roggenrola", "types": ["rock"], "stats": {"speed": 15, "special-defense": 25, "special-attack": 25, "defense": 85, "attack": 75, "hp": 55}}
\ No newline at end of file
+{"name": "roggenrola", "types": ["rock"], "stats": {"hp": 55, "attack": 75, "defense": 85, "special-attack": 25, "special-defense": 25, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_525.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_525.json
index edd9417..cf0dc8f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_525.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_525.json
@@ -1,1 +1,1 @@
-{"name": "boldore", "types": ["rock"], "stats": {"speed": 20, "special-defense": 40, "special-attack": 50, "defense": 105, "attack": 105, "hp": 70}}
\ No newline at end of file
+{"name": "boldore", "types": ["rock"], "stats": {"hp": 70, "attack": 105, "defense": 105, "special-attack": 50, "special-defense": 40, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_526.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_526.json
index c4b4534..a5c367a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_526.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_526.json
@@ -1,1 +1,1 @@
-{"name": "gigalith", "types": ["rock"], "stats": {"speed": 25, "special-defense": 80, "special-attack": 60, "defense": 130, "attack": 135, "hp": 85}}
\ No newline at end of file
+{"name": "gigalith", "types": ["rock"], "stats": {"hp": 85, "attack": 135, "defense": 130, "special-attack": 60, "special-defense": 80, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_527.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_527.json
index 6034b5f..9e53934 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_527.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_527.json
@@ -1,1 +1,1 @@
-{"name": "woobat", "types": ["flying", "psychic"], "stats": {"speed": 72, "special-defense": 43, "special-attack": 55, "defense": 43, "attack": 45, "hp": 65}}
\ No newline at end of file
+{"name": "woobat", "types": ["psychic", "flying"], "stats": {"hp": 65, "attack": 45, "defense": 43, "special-attack": 55, "special-defense": 43, "speed": 72}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_528.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_528.json
index 5422dab..2fbd936 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_528.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_528.json
@@ -1,1 +1,1 @@
-{"name": "swoobat", "types": ["flying", "psychic"], "stats": {"speed": 114, "special-defense": 55, "special-attack": 77, "defense": 55, "attack": 57, "hp": 67}}
\ No newline at end of file
+{"name": "swoobat", "types": ["psychic", "flying"], "stats": {"hp": 67, "attack": 57, "defense": 55, "special-attack": 77, "special-defense": 55, "speed": 114}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_529.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_529.json
index 7911d35..6b7757b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_529.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_529.json
@@ -1,1 +1,1 @@
-{"name": "drilbur", "types": ["ground"], "stats": {"speed": 68, "special-defense": 45, "special-attack": 30, "defense": 40, "attack": 85, "hp": 60}}
\ No newline at end of file
+{"name": "drilbur", "types": ["ground"], "stats": {"hp": 60, "attack": 85, "defense": 40, "special-attack": 30, "special-defense": 45, "speed": 68}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_53.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_53.json
index 95ab5ef..0d8f639 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_53.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_53.json
@@ -1,1 +1,1 @@
-{"name": "persian", "types": ["normal"], "stats": {"speed": 115, "special-defense": 65, "special-attack": 65, "defense": 60, "attack": 70, "hp": 65}}
\ No newline at end of file
+{"name": "persian", "types": ["normal"], "stats": {"hp": 65, "attack": 70, "defense": 60, "special-attack": 65, "special-defense": 65, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_530.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_530.json
index 4fd7714..411fdfa 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_530.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_530.json
@@ -1,1 +1,1 @@
-{"name": "excadrill", "types": ["steel", "ground"], "stats": {"speed": 88, "special-defense": 65, "special-attack": 50, "defense": 60, "attack": 135, "hp": 110}}
\ No newline at end of file
+{"name": "excadrill", "types": ["ground", "steel"], "stats": {"hp": 110, "attack": 135, "defense": 60, "special-attack": 50, "special-defense": 65, "speed": 88}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_531.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_531.json
index d5bf93f..ab2c68d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_531.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_531.json
@@ -1,1 +1,1 @@
-{"name": "audino", "types": ["normal"], "stats": {"speed": 50, "special-defense": 86, "special-attack": 60, "defense": 86, "attack": 60, "hp": 103}}
\ No newline at end of file
+{"name": "audino", "types": ["normal"], "stats": {"hp": 103, "attack": 60, "defense": 86, "special-attack": 60, "special-defense": 86, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_532.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_532.json
index 3a71c79..b23701c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_532.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_532.json
@@ -1,1 +1,1 @@
-{"name": "timburr", "types": ["fighting"], "stats": {"speed": 35, "special-defense": 35, "special-attack": 25, "defense": 55, "attack": 80, "hp": 75}}
\ No newline at end of file
+{"name": "timburr", "types": ["fighting"], "stats": {"hp": 75, "attack": 80, "defense": 55, "special-attack": 25, "special-defense": 35, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_533.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_533.json
index c9ea8a0..5e12762 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_533.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_533.json
@@ -1,1 +1,1 @@
-{"name": "gurdurr", "types": ["fighting"], "stats": {"speed": 40, "special-defense": 50, "special-attack": 40, "defense": 85, "attack": 105, "hp": 85}}
\ No newline at end of file
+{"name": "gurdurr", "types": ["fighting"], "stats": {"hp": 85, "attack": 105, "defense": 85, "special-attack": 40, "special-defense": 50, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_534.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_534.json
index bfca493..96c1e10 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_534.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_534.json
@@ -1,1 +1,1 @@
-{"name": "conkeldurr", "types": ["fighting"], "stats": {"speed": 45, "special-defense": 65, "special-attack": 55, "defense": 95, "attack": 140, "hp": 105}}
\ No newline at end of file
+{"name": "conkeldurr", "types": ["fighting"], "stats": {"hp": 105, "attack": 140, "defense": 95, "special-attack": 55, "special-defense": 65, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_535.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_535.json
index 2ca2bea..a296f67 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_535.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_535.json
@@ -1,1 +1,1 @@
-{"name": "tympole", "types": ["water"], "stats": {"speed": 64, "special-defense": 40, "special-attack": 50, "defense": 40, "attack": 50, "hp": 50}}
\ No newline at end of file
+{"name": "tympole", "types": ["water"], "stats": {"hp": 50, "attack": 50, "defense": 40, "special-attack": 50, "special-defense": 40, "speed": 64}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_536.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_536.json
index 3f0461d..8ffa77b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_536.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_536.json
@@ -1,1 +1,1 @@
-{"name": "palpitoad", "types": ["ground", "water"], "stats": {"speed": 69, "special-defense": 55, "special-attack": 65, "defense": 55, "attack": 65, "hp": 75}}
\ No newline at end of file
+{"name": "palpitoad", "types": ["water", "ground"], "stats": {"hp": 75, "attack": 65, "defense": 55, "special-attack": 65, "special-defense": 55, "speed": 69}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_537.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_537.json
index 4627ad9..c6bc6d9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_537.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_537.json
@@ -1,1 +1,1 @@
-{"name": "seismitoad", "types": ["ground", "water"], "stats": {"speed": 74, "special-defense": 75, "special-attack": 85, "defense": 75, "attack": 95, "hp": 105}}
\ No newline at end of file
+{"name": "seismitoad", "types": ["water", "ground"], "stats": {"hp": 105, "attack": 95, "defense": 75, "special-attack": 85, "special-defense": 75, "speed": 74}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_538.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_538.json
index 2dceb46..578580f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_538.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_538.json
@@ -1,1 +1,1 @@
-{"name": "throh", "types": ["fighting"], "stats": {"speed": 45, "special-defense": 85, "special-attack": 30, "defense": 85, "attack": 100, "hp": 120}}
\ No newline at end of file
+{"name": "throh", "types": ["fighting"], "stats": {"hp": 120, "attack": 100, "defense": 85, "special-attack": 30, "special-defense": 85, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_539.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_539.json
index fcdcde8..2ac4778 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_539.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_539.json
@@ -1,1 +1,1 @@
-{"name": "sawk", "types": ["fighting"], "stats": {"speed": 85, "special-defense": 75, "special-attack": 30, "defense": 75, "attack": 125, "hp": 75}}
\ No newline at end of file
+{"name": "sawk", "types": ["fighting"], "stats": {"hp": 75, "attack": 125, "defense": 75, "special-attack": 30, "special-defense": 75, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_54.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_54.json
index c7ab49c..b7ca8ca 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_54.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_54.json
@@ -1,1 +1,1 @@
-{"name": "psyduck", "types": ["water"], "stats": {"speed": 55, "special-defense": 50, "special-attack": 65, "defense": 48, "attack": 52, "hp": 50}}
\ No newline at end of file
+{"name": "psyduck", "types": ["water"], "stats": {"hp": 50, "attack": 52, "defense": 48, "special-attack": 65, "special-defense": 50, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_540.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_540.json
index a0d1680..13e7da4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_540.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_540.json
@@ -1,1 +1,1 @@
-{"name": "sewaddle", "types": ["grass", "bug"], "stats": {"speed": 42, "special-defense": 60, "special-attack": 40, "defense": 70, "attack": 53, "hp": 45}}
\ No newline at end of file
+{"name": "sewaddle", "types": ["bug", "grass"], "stats": {"hp": 45, "attack": 53, "defense": 70, "special-attack": 40, "special-defense": 60, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_541.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_541.json
index 1ed607f..b4760da 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_541.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_541.json
@@ -1,1 +1,1 @@
-{"name": "swadloon", "types": ["grass", "bug"], "stats": {"speed": 42, "special-defense": 80, "special-attack": 50, "defense": 90, "attack": 63, "hp": 55}}
\ No newline at end of file
+{"name": "swadloon", "types": ["bug", "grass"], "stats": {"hp": 55, "attack": 63, "defense": 90, "special-attack": 50, "special-defense": 80, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_542.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_542.json
index 6af8545..2b4c4a5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_542.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_542.json
@@ -1,1 +1,1 @@
-{"name": "leavanny", "types": ["grass", "bug"], "stats": {"speed": 92, "special-defense": 80, "special-attack": 70, "defense": 80, "attack": 103, "hp": 75}}
\ No newline at end of file
+{"name": "leavanny", "types": ["bug", "grass"], "stats": {"hp": 75, "attack": 103, "defense": 80, "special-attack": 70, "special-defense": 80, "speed": 92}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_543.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_543.json
index c454f68..da82d04 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_543.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_543.json
@@ -1,1 +1,1 @@
-{"name": "venipede", "types": ["poison", "bug"], "stats": {"speed": 57, "special-defense": 39, "special-attack": 30, "defense": 59, "attack": 45, "hp": 30}}
\ No newline at end of file
+{"name": "venipede", "types": ["bug", "poison"], "stats": {"hp": 30, "attack": 45, "defense": 59, "special-attack": 30, "special-defense": 39, "speed": 57}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_544.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_544.json
index ecfc0bc..8d02df5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_544.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_544.json
@@ -1,1 +1,1 @@
-{"name": "whirlipede", "types": ["poison", "bug"], "stats": {"speed": 47, "special-defense": 79, "special-attack": 40, "defense": 99, "attack": 55, "hp": 40}}
\ No newline at end of file
+{"name": "whirlipede", "types": ["bug", "poison"], "stats": {"hp": 40, "attack": 55, "defense": 99, "special-attack": 40, "special-defense": 79, "speed": 47}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_545.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_545.json
index 06c8e84..002ff73 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_545.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_545.json
@@ -1,1 +1,1 @@
-{"name": "scolipede", "types": ["poison", "bug"], "stats": {"speed": 112, "special-defense": 69, "special-attack": 55, "defense": 89, "attack": 100, "hp": 60}}
\ No newline at end of file
+{"name": "scolipede", "types": ["bug", "poison"], "stats": {"hp": 60, "attack": 100, "defense": 89, "special-attack": 55, "special-defense": 69, "speed": 112}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_546.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_546.json
index e9c69c2..00c89f6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_546.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_546.json
@@ -1,1 +1,1 @@
-{"name": "cottonee", "types": ["fairy", "grass"], "stats": {"speed": 66, "special-defense": 50, "special-attack": 37, "defense": 60, "attack": 27, "hp": 40}}
\ No newline at end of file
+{"name": "cottonee", "types": ["grass", "fairy"], "stats": {"hp": 40, "attack": 27, "defense": 60, "special-attack": 37, "special-defense": 50, "speed": 66}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_547.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_547.json
index f7d8935..8edb517 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_547.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_547.json
@@ -1,1 +1,1 @@
-{"name": "whimsicott", "types": ["fairy", "grass"], "stats": {"speed": 116, "special-defense": 75, "special-attack": 77, "defense": 85, "attack": 67, "hp": 60}}
\ No newline at end of file
+{"name": "whimsicott", "types": ["grass", "fairy"], "stats": {"hp": 60, "attack": 67, "defense": 85, "special-attack": 77, "special-defense": 75, "speed": 116}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_548.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_548.json
index f8471ec..f27bc47 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_548.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_548.json
@@ -1,1 +1,1 @@
-{"name": "petilil", "types": ["grass"], "stats": {"speed": 30, "special-defense": 50, "special-attack": 70, "defense": 50, "attack": 35, "hp": 45}}
\ No newline at end of file
+{"name": "petilil", "types": ["grass"], "stats": {"hp": 45, "attack": 35, "defense": 50, "special-attack": 70, "special-defense": 50, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_549.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_549.json
index 4339d87..63218e0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_549.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_549.json
@@ -1,1 +1,1 @@
-{"name": "lilligant", "types": ["grass"], "stats": {"speed": 90, "special-defense": 75, "special-attack": 110, "defense": 75, "attack": 60, "hp": 70}}
\ No newline at end of file
+{"name": "lilligant", "types": ["grass"], "stats": {"hp": 70, "attack": 60, "defense": 75, "special-attack": 110, "special-defense": 75, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_55.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_55.json
index 5353645..d9dab72 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_55.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_55.json
@@ -1,1 +1,1 @@
-{"name": "golduck", "types": ["water"], "stats": {"speed": 85, "special-defense": 80, "special-attack": 95, "defense": 78, "attack": 82, "hp": 80}}
\ No newline at end of file
+{"name": "golduck", "types": ["water"], "stats": {"hp": 80, "attack": 82, "defense": 78, "special-attack": 95, "special-defense": 80, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_550.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_550.json
index 5c1bb8d..8a5084a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_550.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_550.json
@@ -1,1 +1,1 @@
-{"name": "basculin-red-striped", "types": ["water"], "stats": {"speed": 98, "special-defense": 55, "special-attack": 80, "defense": 65, "attack": 92, "hp": 70}}
\ No newline at end of file
+{"name": "basculin-red-striped", "types": ["water"], "stats": {"hp": 70, "attack": 92, "defense": 65, "special-attack": 80, "special-defense": 55, "speed": 98}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_551.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_551.json
index 47a6291..677240e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_551.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_551.json
@@ -1,1 +1,1 @@
-{"name": "sandile", "types": ["dark", "ground"], "stats": {"speed": 65, "special-defense": 35, "special-attack": 35, "defense": 35, "attack": 72, "hp": 50}}
\ No newline at end of file
+{"name": "sandile", "types": ["ground", "dark"], "stats": {"hp": 50, "attack": 72, "defense": 35, "special-attack": 35, "special-defense": 35, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_552.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_552.json
index 742aa27..9d154f2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_552.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_552.json
@@ -1,1 +1,1 @@
-{"name": "krokorok", "types": ["dark", "ground"], "stats": {"speed": 74, "special-defense": 45, "special-attack": 45, "defense": 45, "attack": 82, "hp": 60}}
\ No newline at end of file
+{"name": "krokorok", "types": ["ground", "dark"], "stats": {"hp": 60, "attack": 82, "defense": 45, "special-attack": 45, "special-defense": 45, "speed": 74}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_553.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_553.json
index a6bf823..b8d763a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_553.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_553.json
@@ -1,1 +1,1 @@
-{"name": "krookodile", "types": ["dark", "ground"], "stats": {"speed": 92, "special-defense": 70, "special-attack": 65, "defense": 80, "attack": 117, "hp": 95}}
\ No newline at end of file
+{"name": "krookodile", "types": ["ground", "dark"], "stats": {"hp": 95, "attack": 117, "defense": 80, "special-attack": 65, "special-defense": 70, "speed": 92}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_554.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_554.json
index c2ed891..073a382 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_554.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_554.json
@@ -1,1 +1,1 @@
-{"name": "darumaka", "types": ["fire"], "stats": {"speed": 50, "special-defense": 45, "special-attack": 15, "defense": 45, "attack": 90, "hp": 70}}
\ No newline at end of file
+{"name": "darumaka", "types": ["fire"], "stats": {"hp": 70, "attack": 90, "defense": 45, "special-attack": 15, "special-defense": 45, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_555.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_555.json
index cb6ad0d..0105922 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_555.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_555.json
@@ -1,1 +1,1 @@
-{"name": "darmanitan-standard", "types": ["fire"], "stats": {"speed": 95, "special-defense": 55, "special-attack": 30, "defense": 55, "attack": 140, "hp": 105}}
\ No newline at end of file
+{"name": "darmanitan-standard", "types": ["fire"], "stats": {"hp": 105, "attack": 140, "defense": 55, "special-attack": 30, "special-defense": 55, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_556.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_556.json
index a68b5bb..bf8fa01 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_556.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_556.json
@@ -1,1 +1,1 @@
-{"name": "maractus", "types": ["grass"], "stats": {"speed": 60, "special-defense": 67, "special-attack": 106, "defense": 67, "attack": 86, "hp": 75}}
\ No newline at end of file
+{"name": "maractus", "types": ["grass"], "stats": {"hp": 75, "attack": 86, "defense": 67, "special-attack": 106, "special-defense": 67, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_557.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_557.json
index c243c97..afc7f96 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_557.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_557.json
@@ -1,1 +1,1 @@
-{"name": "dwebble", "types": ["rock", "bug"], "stats": {"speed": 55, "special-defense": 35, "special-attack": 35, "defense": 85, "attack": 65, "hp": 50}}
\ No newline at end of file
+{"name": "dwebble", "types": ["bug", "rock"], "stats": {"hp": 50, "attack": 65, "defense": 85, "special-attack": 35, "special-defense": 35, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_558.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_558.json
index de5086e..e12cd85 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_558.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_558.json
@@ -1,1 +1,1 @@
-{"name": "crustle", "types": ["rock", "bug"], "stats": {"speed": 45, "special-defense": 75, "special-attack": 65, "defense": 125, "attack": 105, "hp": 70}}
\ No newline at end of file
+{"name": "crustle", "types": ["bug", "rock"], "stats": {"hp": 70, "attack": 105, "defense": 125, "special-attack": 65, "special-defense": 75, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_559.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_559.json
index de16fe2..03cf908 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_559.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_559.json
@@ -1,1 +1,1 @@
-{"name": "scraggy", "types": ["fighting", "dark"], "stats": {"speed": 48, "special-defense": 70, "special-attack": 35, "defense": 70, "attack": 75, "hp": 50}}
\ No newline at end of file
+{"name": "scraggy", "types": ["dark", "fighting"], "stats": {"hp": 50, "attack": 75, "defense": 70, "special-attack": 35, "special-defense": 70, "speed": 48}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_56.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_56.json
index bf73c76..71d15ab 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_56.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_56.json
@@ -1,1 +1,1 @@
-{"name": "mankey", "types": ["fighting"], "stats": {"speed": 70, "special-defense": 45, "special-attack": 35, "defense": 35, "attack": 80, "hp": 40}}
\ No newline at end of file
+{"name": "mankey", "types": ["fighting"], "stats": {"hp": 40, "attack": 80, "defense": 35, "special-attack": 35, "special-defense": 45, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_560.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_560.json
index 82ce0ac..aa582a5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_560.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_560.json
@@ -1,1 +1,1 @@
-{"name": "scrafty", "types": ["fighting", "dark"], "stats": {"speed": 58, "special-defense": 115, "special-attack": 45, "defense": 115, "attack": 90, "hp": 65}}
\ No newline at end of file
+{"name": "scrafty", "types": ["dark", "fighting"], "stats": {"hp": 65, "attack": 90, "defense": 115, "special-attack": 45, "special-defense": 115, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_561.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_561.json
index d9a1881..5a0543c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_561.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_561.json
@@ -1,1 +1,1 @@
-{"name": "sigilyph", "types": ["flying", "psychic"], "stats": {"speed": 97, "special-defense": 80, "special-attack": 103, "defense": 80, "attack": 58, "hp": 72}}
\ No newline at end of file
+{"name": "sigilyph", "types": ["psychic", "flying"], "stats": {"hp": 72, "attack": 58, "defense": 80, "special-attack": 103, "special-defense": 80, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_562.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_562.json
index 13fe351..d440363 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_562.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_562.json
@@ -1,1 +1,1 @@
-{"name": "yamask", "types": ["ghost"], "stats": {"speed": 30, "special-defense": 65, "special-attack": 55, "defense": 85, "attack": 30, "hp": 38}}
\ No newline at end of file
+{"name": "yamask", "types": ["ghost"], "stats": {"hp": 38, "attack": 30, "defense": 85, "special-attack": 55, "special-defense": 65, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_563.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_563.json
index 3751849..08e5ae1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_563.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_563.json
@@ -1,1 +1,1 @@
-{"name": "cofagrigus", "types": ["ghost"], "stats": {"speed": 30, "special-defense": 105, "special-attack": 95, "defense": 145, "attack": 50, "hp": 58}}
\ No newline at end of file
+{"name": "cofagrigus", "types": ["ghost"], "stats": {"hp": 58, "attack": 50, "defense": 145, "special-attack": 95, "special-defense": 105, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_564.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_564.json
index 92a3275..2b7c5f2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_564.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_564.json
@@ -1,1 +1,1 @@
-{"name": "tirtouga", "types": ["rock", "water"], "stats": {"speed": 22, "special-defense": 45, "special-attack": 53, "defense": 103, "attack": 78, "hp": 54}}
\ No newline at end of file
+{"name": "tirtouga", "types": ["water", "rock"], "stats": {"hp": 54, "attack": 78, "defense": 103, "special-attack": 53, "special-defense": 45, "speed": 22}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_565.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_565.json
index 5674f8c..47294e8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_565.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_565.json
@@ -1,1 +1,1 @@
-{"name": "carracosta", "types": ["rock", "water"], "stats": {"speed": 32, "special-defense": 65, "special-attack": 83, "defense": 133, "attack": 108, "hp": 74}}
\ No newline at end of file
+{"name": "carracosta", "types": ["water", "rock"], "stats": {"hp": 74, "attack": 108, "defense": 133, "special-attack": 83, "special-defense": 65, "speed": 32}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_566.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_566.json
index e8a5c87..35a53d2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_566.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_566.json
@@ -1,1 +1,1 @@
-{"name": "archen", "types": ["flying", "rock"], "stats": {"speed": 70, "special-defense": 45, "special-attack": 74, "defense": 45, "attack": 112, "hp": 55}}
\ No newline at end of file
+{"name": "archen", "types": ["rock", "flying"], "stats": {"hp": 55, "attack": 112, "defense": 45, "special-attack": 74, "special-defense": 45, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_567.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_567.json
index fa3c3c1..c34f27a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_567.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_567.json
@@ -1,1 +1,1 @@
-{"name": "archeops", "types": ["flying", "rock"], "stats": {"speed": 110, "special-defense": 65, "special-attack": 112, "defense": 65, "attack": 140, "hp": 75}}
\ No newline at end of file
+{"name": "archeops", "types": ["rock", "flying"], "stats": {"hp": 75, "attack": 140, "defense": 65, "special-attack": 112, "special-defense": 65, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_568.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_568.json
index 960a4e7..c90b4ce 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_568.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_568.json
@@ -1,1 +1,1 @@
-{"name": "trubbish", "types": ["poison"], "stats": {"speed": 65, "special-defense": 62, "special-attack": 40, "defense": 62, "attack": 50, "hp": 50}}
\ No newline at end of file
+{"name": "trubbish", "types": ["poison"], "stats": {"hp": 50, "attack": 50, "defense": 62, "special-attack": 40, "special-defense": 62, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_569.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_569.json
index 974094f..ea0697f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_569.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_569.json
@@ -1,1 +1,1 @@
-{"name": "garbodor", "types": ["poison"], "stats": {"speed": 75, "special-defense": 82, "special-attack": 60, "defense": 82, "attack": 95, "hp": 80}}
\ No newline at end of file
+{"name": "garbodor", "types": ["poison"], "stats": {"hp": 80, "attack": 95, "defense": 82, "special-attack": 60, "special-defense": 82, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_57.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_57.json
index a710bef..8433375 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_57.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_57.json
@@ -1,1 +1,1 @@
-{"name": "primeape", "types": ["fighting"], "stats": {"speed": 95, "special-defense": 70, "special-attack": 60, "defense": 60, "attack": 105, "hp": 65}}
\ No newline at end of file
+{"name": "primeape", "types": ["fighting"], "stats": {"hp": 65, "attack": 105, "defense": 60, "special-attack": 60, "special-defense": 70, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_570.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_570.json
index 29d7934..9a40dc3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_570.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_570.json
@@ -1,1 +1,1 @@
-{"name": "zorua", "types": ["dark"], "stats": {"speed": 65, "special-defense": 40, "special-attack": 80, "defense": 40, "attack": 65, "hp": 40}}
\ No newline at end of file
+{"name": "zorua", "types": ["dark"], "stats": {"hp": 40, "attack": 65, "defense": 40, "special-attack": 80, "special-defense": 40, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_571.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_571.json
index e93a1d9..3d4272b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_571.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_571.json
@@ -1,1 +1,1 @@
-{"name": "zoroark", "types": ["dark"], "stats": {"speed": 105, "special-defense": 60, "special-attack": 120, "defense": 60, "attack": 105, "hp": 60}}
\ No newline at end of file
+{"name": "zoroark", "types": ["dark"], "stats": {"hp": 60, "attack": 105, "defense": 60, "special-attack": 120, "special-defense": 60, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_572.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_572.json
index d4d723c..26f9984 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_572.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_572.json
@@ -1,1 +1,1 @@
-{"name": "minccino", "types": ["normal"], "stats": {"speed": 75, "special-defense": 40, "special-attack": 40, "defense": 40, "attack": 50, "hp": 55}}
\ No newline at end of file
+{"name": "minccino", "types": ["normal"], "stats": {"hp": 55, "attack": 50, "defense": 40, "special-attack": 40, "special-defense": 40, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_573.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_573.json
index a7fd83a..7b36b96 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_573.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_573.json
@@ -1,1 +1,1 @@
-{"name": "cinccino", "types": ["normal"], "stats": {"speed": 115, "special-defense": 60, "special-attack": 65, "defense": 60, "attack": 95, "hp": 75}}
\ No newline at end of file
+{"name": "cinccino", "types": ["normal"], "stats": {"hp": 75, "attack": 95, "defense": 60, "special-attack": 65, "special-defense": 60, "speed": 115}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_574.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_574.json
index 9dfa4fe..86c5f51 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_574.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_574.json
@@ -1,1 +1,1 @@
-{"name": "gothita", "types": ["psychic"], "stats": {"speed": 45, "special-defense": 65, "special-attack": 55, "defense": 50, "attack": 30, "hp": 45}}
\ No newline at end of file
+{"name": "gothita", "types": ["psychic"], "stats": {"hp": 45, "attack": 30, "defense": 50, "special-attack": 55, "special-defense": 65, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_575.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_575.json
index 0a3eac9..bf43b05 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_575.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_575.json
@@ -1,1 +1,1 @@
-{"name": "gothorita", "types": ["psychic"], "stats": {"speed": 55, "special-defense": 85, "special-attack": 75, "defense": 70, "attack": 45, "hp": 60}}
\ No newline at end of file
+{"name": "gothorita", "types": ["psychic"], "stats": {"hp": 60, "attack": 45, "defense": 70, "special-attack": 75, "special-defense": 85, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_576.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_576.json
index 0587793..ed161e3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_576.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_576.json
@@ -1,1 +1,1 @@
-{"name": "gothitelle", "types": ["psychic"], "stats": {"speed": 65, "special-defense": 110, "special-attack": 95, "defense": 95, "attack": 55, "hp": 70}}
\ No newline at end of file
+{"name": "gothitelle", "types": ["psychic"], "stats": {"hp": 70, "attack": 55, "defense": 95, "special-attack": 95, "special-defense": 110, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_577.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_577.json
index 244b13d..a8a793a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_577.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_577.json
@@ -1,1 +1,1 @@
-{"name": "solosis", "types": ["psychic"], "stats": {"speed": 20, "special-defense": 50, "special-attack": 105, "defense": 40, "attack": 30, "hp": 45}}
\ No newline at end of file
+{"name": "solosis", "types": ["psychic"], "stats": {"hp": 45, "attack": 30, "defense": 40, "special-attack": 105, "special-defense": 50, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_578.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_578.json
index 43a7984..e78df8b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_578.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_578.json
@@ -1,1 +1,1 @@
-{"name": "duosion", "types": ["psychic"], "stats": {"speed": 30, "special-defense": 60, "special-attack": 125, "defense": 50, "attack": 40, "hp": 65}}
\ No newline at end of file
+{"name": "duosion", "types": ["psychic"], "stats": {"hp": 65, "attack": 40, "defense": 50, "special-attack": 125, "special-defense": 60, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_579.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_579.json
index c352736..ee307bc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_579.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_579.json
@@ -1,1 +1,1 @@
-{"name": "reuniclus", "types": ["psychic"], "stats": {"speed": 30, "special-defense": 85, "special-attack": 125, "defense": 75, "attack": 65, "hp": 110}}
\ No newline at end of file
+{"name": "reuniclus", "types": ["psychic"], "stats": {"hp": 110, "attack": 65, "defense": 75, "special-attack": 125, "special-defense": 85, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_58.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_58.json
index 7072e1e..09794c5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_58.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_58.json
@@ -1,1 +1,1 @@
-{"name": "growlithe", "types": ["fire"], "stats": {"speed": 60, "special-defense": 50, "special-attack": 70, "defense": 45, "attack": 70, "hp": 55}}
\ No newline at end of file
+{"name": "growlithe", "types": ["fire"], "stats": {"hp": 55, "attack": 70, "defense": 45, "special-attack": 70, "special-defense": 50, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_580.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_580.json
index 9f5c655..0ab8975 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_580.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_580.json
@@ -1,1 +1,1 @@
-{"name": "ducklett", "types": ["flying", "water"], "stats": {"speed": 55, "special-defense": 50, "special-attack": 44, "defense": 50, "attack": 44, "hp": 62}}
\ No newline at end of file
+{"name": "ducklett", "types": ["water", "flying"], "stats": {"hp": 62, "attack": 44, "defense": 50, "special-attack": 44, "special-defense": 50, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_581.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_581.json
index 0748758..fd788ca 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_581.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_581.json
@@ -1,1 +1,1 @@
-{"name": "swanna", "types": ["flying", "water"], "stats": {"speed": 98, "special-defense": 63, "special-attack": 87, "defense": 63, "attack": 87, "hp": 75}}
\ No newline at end of file
+{"name": "swanna", "types": ["water", "flying"], "stats": {"hp": 75, "attack": 87, "defense": 63, "special-attack": 87, "special-defense": 63, "speed": 98}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_582.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_582.json
index 2602f55..210fe6b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_582.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_582.json
@@ -1,1 +1,1 @@
-{"name": "vanillite", "types": ["ice"], "stats": {"speed": 44, "special-defense": 60, "special-attack": 65, "defense": 50, "attack": 50, "hp": 36}}
\ No newline at end of file
+{"name": "vanillite", "types": ["ice"], "stats": {"hp": 36, "attack": 50, "defense": 50, "special-attack": 65, "special-defense": 60, "speed": 44}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_583.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_583.json
index 7d2aad0..47c54c6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_583.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_583.json
@@ -1,1 +1,1 @@
-{"name": "vanillish", "types": ["ice"], "stats": {"speed": 59, "special-defense": 75, "special-attack": 80, "defense": 65, "attack": 65, "hp": 51}}
\ No newline at end of file
+{"name": "vanillish", "types": ["ice"], "stats": {"hp": 51, "attack": 65, "defense": 65, "special-attack": 80, "special-defense": 75, "speed": 59}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_584.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_584.json
index 49d9538..6d2aca6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_584.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_584.json
@@ -1,1 +1,1 @@
-{"name": "vanilluxe", "types": ["ice"], "stats": {"speed": 79, "special-defense": 95, "special-attack": 110, "defense": 85, "attack": 95, "hp": 71}}
\ No newline at end of file
+{"name": "vanilluxe", "types": ["ice"], "stats": {"hp": 71, "attack": 95, "defense": 85, "special-attack": 110, "special-defense": 95, "speed": 79}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_585.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_585.json
index 794171c..bd0d71d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_585.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_585.json
@@ -1,1 +1,1 @@
-{"name": "deerling", "types": ["grass", "normal"], "stats": {"speed": 75, "special-defense": 50, "special-attack": 40, "defense": 50, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "deerling", "types": ["normal", "grass"], "stats": {"hp": 60, "attack": 60, "defense": 50, "special-attack": 40, "special-defense": 50, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_586.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_586.json
index e9a8fa9..8a7b253 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_586.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_586.json
@@ -1,1 +1,1 @@
-{"name": "sawsbuck", "types": ["grass", "normal"], "stats": {"speed": 95, "special-defense": 70, "special-attack": 60, "defense": 70, "attack": 100, "hp": 80}}
\ No newline at end of file
+{"name": "sawsbuck", "types": ["normal", "grass"], "stats": {"hp": 80, "attack": 100, "defense": 70, "special-attack": 60, "special-defense": 70, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_587.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_587.json
index 63c9a4a..9677443 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_587.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_587.json
@@ -1,1 +1,1 @@
-{"name": "emolga", "types": ["flying", "electric"], "stats": {"speed": 103, "special-defense": 60, "special-attack": 75, "defense": 60, "attack": 75, "hp": 55}}
\ No newline at end of file
+{"name": "emolga", "types": ["electric", "flying"], "stats": {"hp": 55, "attack": 75, "defense": 60, "special-attack": 75, "special-defense": 60, "speed": 103}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_588.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_588.json
index e8584a7..c8b0d56 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_588.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_588.json
@@ -1,1 +1,1 @@
-{"name": "karrablast", "types": ["bug"], "stats": {"speed": 60, "special-defense": 45, "special-attack": 40, "defense": 45, "attack": 75, "hp": 50}}
\ No newline at end of file
+{"name": "karrablast", "types": ["bug"], "stats": {"hp": 50, "attack": 75, "defense": 45, "special-attack": 40, "special-defense": 45, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_589.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_589.json
index f4883c2..f36ee0b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_589.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_589.json
@@ -1,1 +1,1 @@
-{"name": "escavalier", "types": ["steel", "bug"], "stats": {"speed": 20, "special-defense": 105, "special-attack": 60, "defense": 105, "attack": 135, "hp": 70}}
\ No newline at end of file
+{"name": "escavalier", "types": ["bug", "steel"], "stats": {"hp": 70, "attack": 135, "defense": 105, "special-attack": 60, "special-defense": 105, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_59.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_59.json
index fffcef2..097be39 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_59.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_59.json
@@ -1,1 +1,1 @@
-{"name": "arcanine", "types": ["fire"], "stats": {"speed": 95, "special-defense": 80, "special-attack": 100, "defense": 80, "attack": 110, "hp": 90}}
\ No newline at end of file
+{"name": "arcanine", "types": ["fire"], "stats": {"hp": 90, "attack": 110, "defense": 80, "special-attack": 100, "special-defense": 80, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_590.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_590.json
index 2b4cb0d..3245422 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_590.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_590.json
@@ -1,1 +1,1 @@
-{"name": "foongus", "types": ["poison", "grass"], "stats": {"speed": 15, "special-defense": 55, "special-attack": 55, "defense": 45, "attack": 55, "hp": 69}}
\ No newline at end of file
+{"name": "foongus", "types": ["grass", "poison"], "stats": {"hp": 69, "attack": 55, "defense": 45, "special-attack": 55, "special-defense": 55, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_591.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_591.json
index b8e2bbc..0b01159 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_591.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_591.json
@@ -1,1 +1,1 @@
-{"name": "amoonguss", "types": ["poison", "grass"], "stats": {"speed": 30, "special-defense": 80, "special-attack": 85, "defense": 70, "attack": 85, "hp": 114}}
\ No newline at end of file
+{"name": "amoonguss", "types": ["grass", "poison"], "stats": {"hp": 114, "attack": 85, "defense": 70, "special-attack": 85, "special-defense": 80, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_592.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_592.json
index d2b1a6f..1076d5c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_592.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_592.json
@@ -1,1 +1,1 @@
-{"name": "frillish", "types": ["ghost", "water"], "stats": {"speed": 40, "special-defense": 85, "special-attack": 65, "defense": 50, "attack": 40, "hp": 55}}
\ No newline at end of file
+{"name": "frillish", "types": ["water", "ghost"], "stats": {"hp": 55, "attack": 40, "defense": 50, "special-attack": 65, "special-defense": 85, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_593.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_593.json
index 46cae39..4551141 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_593.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_593.json
@@ -1,1 +1,1 @@
-{"name": "jellicent", "types": ["ghost", "water"], "stats": {"speed": 60, "special-defense": 105, "special-attack": 85, "defense": 70, "attack": 60, "hp": 100}}
\ No newline at end of file
+{"name": "jellicent", "types": ["water", "ghost"], "stats": {"hp": 100, "attack": 60, "defense": 70, "special-attack": 85, "special-defense": 105, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_594.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_594.json
index 523d6e4..238de59 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_594.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_594.json
@@ -1,1 +1,1 @@
-{"name": "alomomola", "types": ["water"], "stats": {"speed": 65, "special-defense": 45, "special-attack": 40, "defense": 80, "attack": 75, "hp": 165}}
\ No newline at end of file
+{"name": "alomomola", "types": ["water"], "stats": {"hp": 165, "attack": 75, "defense": 80, "special-attack": 40, "special-defense": 45, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_595.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_595.json
index 764e64d..43caac8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_595.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_595.json
@@ -1,1 +1,1 @@
-{"name": "joltik", "types": ["electric", "bug"], "stats": {"speed": 65, "special-defense": 50, "special-attack": 57, "defense": 50, "attack": 47, "hp": 50}}
\ No newline at end of file
+{"name": "joltik", "types": ["bug", "electric"], "stats": {"hp": 50, "attack": 47, "defense": 50, "special-attack": 57, "special-defense": 50, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_596.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_596.json
index 72e65ef..1d1b8e0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_596.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_596.json
@@ -1,1 +1,1 @@
-{"name": "galvantula", "types": ["electric", "bug"], "stats": {"speed": 108, "special-defense": 60, "special-attack": 97, "defense": 60, "attack": 77, "hp": 70}}
\ No newline at end of file
+{"name": "galvantula", "types": ["bug", "electric"], "stats": {"hp": 70, "attack": 77, "defense": 60, "special-attack": 97, "special-defense": 60, "speed": 108}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_597.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_597.json
index 676c2e6..aa994ce 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_597.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_597.json
@@ -1,1 +1,1 @@
-{"name": "ferroseed", "types": ["steel", "grass"], "stats": {"speed": 10, "special-defense": 86, "special-attack": 24, "defense": 91, "attack": 50, "hp": 44}}
\ No newline at end of file
+{"name": "ferroseed", "types": ["grass", "steel"], "stats": {"hp": 44, "attack": 50, "defense": 91, "special-attack": 24, "special-defense": 86, "speed": 10}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_598.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_598.json
index bfc5700..dae761e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_598.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_598.json
@@ -1,1 +1,1 @@
-{"name": "ferrothorn", "types": ["steel", "grass"], "stats": {"speed": 20, "special-defense": 116, "special-attack": 54, "defense": 131, "attack": 94, "hp": 74}}
\ No newline at end of file
+{"name": "ferrothorn", "types": ["grass", "steel"], "stats": {"hp": 74, "attack": 94, "defense": 131, "special-attack": 54, "special-defense": 116, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_599.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_599.json
index 00503b8..7611e9b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_599.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_599.json
@@ -1,1 +1,1 @@
-{"name": "klink", "types": ["steel"], "stats": {"speed": 30, "special-defense": 60, "special-attack": 45, "defense": 70, "attack": 55, "hp": 40}}
\ No newline at end of file
+{"name": "klink", "types": ["steel"], "stats": {"hp": 40, "attack": 55, "defense": 70, "special-attack": 45, "special-defense": 60, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_6.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_6.json
index 4d52a87..efddeca 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_6.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_6.json
@@ -1,1 +1,1 @@
-{"name": "charizard", "types": ["flying", "fire"], "stats": {"speed": 100, "special-defense": 85, "special-attack": 109, "defense": 78, "attack": 84, "hp": 78}}
\ No newline at end of file
+{"name": "charizard", "types": ["fire", "flying"], "stats": {"hp": 78, "attack": 84, "defense": 78, "special-attack": 109, "special-defense": 85, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_60.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_60.json
index 08b0d5e..7985d49 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_60.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_60.json
@@ -1,1 +1,1 @@
-{"name": "poliwag", "types": ["water"], "stats": {"speed": 90, "special-defense": 40, "special-attack": 40, "defense": 40, "attack": 50, "hp": 40}}
\ No newline at end of file
+{"name": "poliwag", "types": ["water"], "stats": {"hp": 40, "attack": 50, "defense": 40, "special-attack": 40, "special-defense": 40, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_600.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_600.json
index 4b8f4a9..a3798fd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_600.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_600.json
@@ -1,1 +1,1 @@
-{"name": "klang", "types": ["steel"], "stats": {"speed": 50, "special-defense": 85, "special-attack": 70, "defense": 95, "attack": 80, "hp": 60}}
\ No newline at end of file
+{"name": "klang", "types": ["steel"], "stats": {"hp": 60, "attack": 80, "defense": 95, "special-attack": 70, "special-defense": 85, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_601.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_601.json
index 13041e8..a00d03f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_601.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_601.json
@@ -1,1 +1,1 @@
-{"name": "klinklang", "types": ["steel"], "stats": {"speed": 90, "special-defense": 85, "special-attack": 70, "defense": 115, "attack": 100, "hp": 60}}
\ No newline at end of file
+{"name": "klinklang", "types": ["steel"], "stats": {"hp": 60, "attack": 100, "defense": 115, "special-attack": 70, "special-defense": 85, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_602.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_602.json
index d400881..5804606 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_602.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_602.json
@@ -1,1 +1,1 @@
-{"name": "tynamo", "types": ["electric"], "stats": {"speed": 60, "special-defense": 40, "special-attack": 45, "defense": 40, "attack": 55, "hp": 35}}
\ No newline at end of file
+{"name": "tynamo", "types": ["electric"], "stats": {"hp": 35, "attack": 55, "defense": 40, "special-attack": 45, "special-defense": 40, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_603.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_603.json
index bf17b07..03a9fe6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_603.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_603.json
@@ -1,1 +1,1 @@
-{"name": "eelektrik", "types": ["electric"], "stats": {"speed": 40, "special-defense": 70, "special-attack": 75, "defense": 70, "attack": 85, "hp": 65}}
\ No newline at end of file
+{"name": "eelektrik", "types": ["electric"], "stats": {"hp": 65, "attack": 85, "defense": 70, "special-attack": 75, "special-defense": 70, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_604.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_604.json
index f039d4f..c71f8fd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_604.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_604.json
@@ -1,1 +1,1 @@
-{"name": "eelektross", "types": ["electric"], "stats": {"speed": 50, "special-defense": 80, "special-attack": 105, "defense": 80, "attack": 115, "hp": 85}}
\ No newline at end of file
+{"name": "eelektross", "types": ["electric"], "stats": {"hp": 85, "attack": 115, "defense": 80, "special-attack": 105, "special-defense": 80, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_605.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_605.json
index c799e66..15ea87a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_605.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_605.json
@@ -1,1 +1,1 @@
-{"name": "elgyem", "types": ["psychic"], "stats": {"speed": 30, "special-defense": 55, "special-attack": 85, "defense": 55, "attack": 55, "hp": 55}}
\ No newline at end of file
+{"name": "elgyem", "types": ["psychic"], "stats": {"hp": 55, "attack": 55, "defense": 55, "special-attack": 85, "special-defense": 55, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_606.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_606.json
index ae9809d..dbb29a8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_606.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_606.json
@@ -1,1 +1,1 @@
-{"name": "beheeyem", "types": ["psychic"], "stats": {"speed": 40, "special-defense": 95, "special-attack": 125, "defense": 75, "attack": 75, "hp": 75}}
\ No newline at end of file
+{"name": "beheeyem", "types": ["psychic"], "stats": {"hp": 75, "attack": 75, "defense": 75, "special-attack": 125, "special-defense": 95, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_607.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_607.json
index 94343b3..af38217 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_607.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_607.json
@@ -1,1 +1,1 @@
-{"name": "litwick", "types": ["fire", "ghost"], "stats": {"speed": 20, "special-defense": 55, "special-attack": 65, "defense": 55, "attack": 30, "hp": 50}}
\ No newline at end of file
+{"name": "litwick", "types": ["ghost", "fire"], "stats": {"hp": 50, "attack": 30, "defense": 55, "special-attack": 65, "special-defense": 55, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_608.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_608.json
index 81e4499..711af3a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_608.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_608.json
@@ -1,1 +1,1 @@
-{"name": "lampent", "types": ["fire", "ghost"], "stats": {"speed": 55, "special-defense": 60, "special-attack": 95, "defense": 60, "attack": 40, "hp": 60}}
\ No newline at end of file
+{"name": "lampent", "types": ["ghost", "fire"], "stats": {"hp": 60, "attack": 40, "defense": 60, "special-attack": 95, "special-defense": 60, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_609.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_609.json
index 770fbd6..4471072 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_609.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_609.json
@@ -1,1 +1,1 @@
-{"name": "chandelure", "types": ["fire", "ghost"], "stats": {"speed": 80, "special-defense": 90, "special-attack": 145, "defense": 90, "attack": 55, "hp": 60}}
\ No newline at end of file
+{"name": "chandelure", "types": ["ghost", "fire"], "stats": {"hp": 60, "attack": 55, "defense": 90, "special-attack": 145, "special-defense": 90, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_61.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_61.json
index 9f76c15..92e6811 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_61.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_61.json
@@ -1,1 +1,1 @@
-{"name": "poliwhirl", "types": ["water"], "stats": {"speed": 90, "special-defense": 50, "special-attack": 50, "defense": 65, "attack": 65, "hp": 65}}
\ No newline at end of file
+{"name": "poliwhirl", "types": ["water"], "stats": {"hp": 65, "attack": 65, "defense": 65, "special-attack": 50, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_610.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_610.json
index 5861d29..19de477 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_610.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_610.json
@@ -1,1 +1,1 @@
-{"name": "axew", "types": ["dragon"], "stats": {"speed": 57, "special-defense": 40, "special-attack": 30, "defense": 60, "attack": 87, "hp": 46}}
\ No newline at end of file
+{"name": "axew", "types": ["dragon"], "stats": {"hp": 46, "attack": 87, "defense": 60, "special-attack": 30, "special-defense": 40, "speed": 57}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_611.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_611.json
index c298afc..3339656 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_611.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_611.json
@@ -1,1 +1,1 @@
-{"name": "fraxure", "types": ["dragon"], "stats": {"speed": 67, "special-defense": 50, "special-attack": 40, "defense": 70, "attack": 117, "hp": 66}}
\ No newline at end of file
+{"name": "fraxure", "types": ["dragon"], "stats": {"hp": 66, "attack": 117, "defense": 70, "special-attack": 40, "special-defense": 50, "speed": 67}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_612.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_612.json
index 7b37be7..be2c0e2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_612.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_612.json
@@ -1,1 +1,1 @@
-{"name": "haxorus", "types": ["dragon"], "stats": {"speed": 97, "special-defense": 70, "special-attack": 60, "defense": 90, "attack": 147, "hp": 76}}
\ No newline at end of file
+{"name": "haxorus", "types": ["dragon"], "stats": {"hp": 76, "attack": 147, "defense": 90, "special-attack": 60, "special-defense": 70, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_613.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_613.json
index c285c05..109261a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_613.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_613.json
@@ -1,1 +1,1 @@
-{"name": "cubchoo", "types": ["ice"], "stats": {"speed": 40, "special-defense": 40, "special-attack": 60, "defense": 40, "attack": 70, "hp": 55}}
\ No newline at end of file
+{"name": "cubchoo", "types": ["ice"], "stats": {"hp": 55, "attack": 70, "defense": 40, "special-attack": 60, "special-defense": 40, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_614.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_614.json
index 83485e5..013b876 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_614.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_614.json
@@ -1,1 +1,1 @@
-{"name": "beartic", "types": ["ice"], "stats": {"speed": 50, "special-defense": 80, "special-attack": 70, "defense": 80, "attack": 130, "hp": 95}}
\ No newline at end of file
+{"name": "beartic", "types": ["ice"], "stats": {"hp": 95, "attack": 130, "defense": 80, "special-attack": 70, "special-defense": 80, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_615.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_615.json
index 11e6cf7..1fabdf2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_615.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_615.json
@@ -1,1 +1,1 @@
-{"name": "cryogonal", "types": ["ice"], "stats": {"speed": 105, "special-defense": 135, "special-attack": 95, "defense": 50, "attack": 50, "hp": 80}}
\ No newline at end of file
+{"name": "cryogonal", "types": ["ice"], "stats": {"hp": 80, "attack": 50, "defense": 50, "special-attack": 95, "special-defense": 135, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_616.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_616.json
index a63b1b3..32bd9d8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_616.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_616.json
@@ -1,1 +1,1 @@
-{"name": "shelmet", "types": ["bug"], "stats": {"speed": 25, "special-defense": 65, "special-attack": 40, "defense": 85, "attack": 40, "hp": 50}}
\ No newline at end of file
+{"name": "shelmet", "types": ["bug"], "stats": {"hp": 50, "attack": 40, "defense": 85, "special-attack": 40, "special-defense": 65, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_617.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_617.json
index 21dc706..8a9d168 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_617.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_617.json
@@ -1,1 +1,1 @@
-{"name": "accelgor", "types": ["bug"], "stats": {"speed": 145, "special-defense": 60, "special-attack": 100, "defense": 40, "attack": 70, "hp": 80}}
\ No newline at end of file
+{"name": "accelgor", "types": ["bug"], "stats": {"hp": 80, "attack": 70, "defense": 40, "special-attack": 100, "special-defense": 60, "speed": 145}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_618.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_618.json
index d28d6aa..9b3911e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_618.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_618.json
@@ -1,1 +1,1 @@
-{"name": "stunfisk", "types": ["electric", "ground"], "stats": {"speed": 32, "special-defense": 99, "special-attack": 81, "defense": 84, "attack": 66, "hp": 109}}
\ No newline at end of file
+{"name": "stunfisk", "types": ["ground", "electric"], "stats": {"hp": 109, "attack": 66, "defense": 84, "special-attack": 81, "special-defense": 99, "speed": 32}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_619.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_619.json
index d25ac63..c6e924a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_619.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_619.json
@@ -1,1 +1,1 @@
-{"name": "mienfoo", "types": ["fighting"], "stats": {"speed": 65, "special-defense": 50, "special-attack": 55, "defense": 50, "attack": 85, "hp": 45}}
\ No newline at end of file
+{"name": "mienfoo", "types": ["fighting"], "stats": {"hp": 45, "attack": 85, "defense": 50, "special-attack": 55, "special-defense": 50, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_62.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_62.json
index 5787514..63f3ae3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_62.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_62.json
@@ -1,1 +1,1 @@
-{"name": "poliwrath", "types": ["fighting", "water"], "stats": {"speed": 70, "special-defense": 90, "special-attack": 70, "defense": 95, "attack": 95, "hp": 90}}
\ No newline at end of file
+{"name": "poliwrath", "types": ["water", "fighting"], "stats": {"hp": 90, "attack": 95, "defense": 95, "special-attack": 70, "special-defense": 90, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_620.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_620.json
index a2dad63..46271ba 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_620.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_620.json
@@ -1,1 +1,1 @@
-{"name": "mienshao", "types": ["fighting"], "stats": {"speed": 105, "special-defense": 60, "special-attack": 95, "defense": 60, "attack": 125, "hp": 65}}
\ No newline at end of file
+{"name": "mienshao", "types": ["fighting"], "stats": {"hp": 65, "attack": 125, "defense": 60, "special-attack": 95, "special-defense": 60, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_621.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_621.json
index b742027..a7ef83d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_621.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_621.json
@@ -1,1 +1,1 @@
-{"name": "druddigon", "types": ["dragon"], "stats": {"speed": 48, "special-defense": 90, "special-attack": 60, "defense": 90, "attack": 120, "hp": 77}}
\ No newline at end of file
+{"name": "druddigon", "types": ["dragon"], "stats": {"hp": 77, "attack": 120, "defense": 90, "special-attack": 60, "special-defense": 90, "speed": 48}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_622.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_622.json
index 9470364..37cd17e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_622.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_622.json
@@ -1,1 +1,1 @@
-{"name": "golett", "types": ["ghost", "ground"], "stats": {"speed": 35, "special-defense": 50, "special-attack": 35, "defense": 50, "attack": 74, "hp": 59}}
\ No newline at end of file
+{"name": "golett", "types": ["ground", "ghost"], "stats": {"hp": 59, "attack": 74, "defense": 50, "special-attack": 35, "special-defense": 50, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_623.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_623.json
index da2b701..b5a2673 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_623.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_623.json
@@ -1,1 +1,1 @@
-{"name": "golurk", "types": ["ghost", "ground"], "stats": {"speed": 55, "special-defense": 80, "special-attack": 55, "defense": 80, "attack": 124, "hp": 89}}
\ No newline at end of file
+{"name": "golurk", "types": ["ground", "ghost"], "stats": {"hp": 89, "attack": 124, "defense": 80, "special-attack": 55, "special-defense": 80, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_624.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_624.json
index 3fe8cfe..0cde410 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_624.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_624.json
@@ -1,1 +1,1 @@
-{"name": "pawniard", "types": ["steel", "dark"], "stats": {"speed": 60, "special-defense": 40, "special-attack": 40, "defense": 70, "attack": 85, "hp": 45}}
\ No newline at end of file
+{"name": "pawniard", "types": ["dark", "steel"], "stats": {"hp": 45, "attack": 85, "defense": 70, "special-attack": 40, "special-defense": 40, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_625.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_625.json
index a7d4b4e..e9e82aa 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_625.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_625.json
@@ -1,1 +1,1 @@
-{"name": "bisharp", "types": ["steel", "dark"], "stats": {"speed": 70, "special-defense": 70, "special-attack": 60, "defense": 100, "attack": 125, "hp": 65}}
\ No newline at end of file
+{"name": "bisharp", "types": ["dark", "steel"], "stats": {"hp": 65, "attack": 125, "defense": 100, "special-attack": 60, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_626.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_626.json
index e21532f..8cb4e7d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_626.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_626.json
@@ -1,1 +1,1 @@
-{"name": "bouffalant", "types": ["normal"], "stats": {"speed": 55, "special-defense": 95, "special-attack": 40, "defense": 95, "attack": 110, "hp": 95}}
\ No newline at end of file
+{"name": "bouffalant", "types": ["normal"], "stats": {"hp": 95, "attack": 110, "defense": 95, "special-attack": 40, "special-defense": 95, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_627.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_627.json
index df781ac..45abd36 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_627.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_627.json
@@ -1,1 +1,1 @@
-{"name": "rufflet", "types": ["flying", "normal"], "stats": {"speed": 60, "special-defense": 50, "special-attack": 37, "defense": 50, "attack": 83, "hp": 70}}
\ No newline at end of file
+{"name": "rufflet", "types": ["normal", "flying"], "stats": {"hp": 70, "attack": 83, "defense": 50, "special-attack": 37, "special-defense": 50, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_628.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_628.json
index 4d9c3ad..58ca2f9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_628.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_628.json
@@ -1,1 +1,1 @@
-{"name": "braviary", "types": ["flying", "normal"], "stats": {"speed": 80, "special-defense": 75, "special-attack": 57, "defense": 75, "attack": 123, "hp": 100}}
\ No newline at end of file
+{"name": "braviary", "types": ["normal", "flying"], "stats": {"hp": 100, "attack": 123, "defense": 75, "special-attack": 57, "special-defense": 75, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_629.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_629.json
index ee06cce..c16b84d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_629.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_629.json
@@ -1,1 +1,1 @@
-{"name": "vullaby", "types": ["flying", "dark"], "stats": {"speed": 60, "special-defense": 65, "special-attack": 45, "defense": 75, "attack": 55, "hp": 70}}
\ No newline at end of file
+{"name": "vullaby", "types": ["dark", "flying"], "stats": {"hp": 70, "attack": 55, "defense": 75, "special-attack": 45, "special-defense": 65, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_63.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_63.json
index e521632..39ebc88 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_63.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_63.json
@@ -1,1 +1,1 @@
-{"name": "abra", "types": ["psychic"], "stats": {"speed": 90, "special-defense": 55, "special-attack": 105, "defense": 15, "attack": 20, "hp": 25}}
\ No newline at end of file
+{"name": "abra", "types": ["psychic"], "stats": {"hp": 25, "attack": 20, "defense": 15, "special-attack": 105, "special-defense": 55, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_630.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_630.json
index b8472ee..8010e3e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_630.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_630.json
@@ -1,1 +1,1 @@
-{"name": "mandibuzz", "types": ["flying", "dark"], "stats": {"speed": 80, "special-defense": 95, "special-attack": 55, "defense": 105, "attack": 65, "hp": 110}}
\ No newline at end of file
+{"name": "mandibuzz", "types": ["dark", "flying"], "stats": {"hp": 110, "attack": 65, "defense": 105, "special-attack": 55, "special-defense": 95, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_631.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_631.json
index 25eea89..5126a89 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_631.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_631.json
@@ -1,1 +1,1 @@
-{"name": "heatmor", "types": ["fire"], "stats": {"speed": 65, "special-defense": 66, "special-attack": 105, "defense": 66, "attack": 97, "hp": 85}}
\ No newline at end of file
+{"name": "heatmor", "types": ["fire"], "stats": {"hp": 85, "attack": 97, "defense": 66, "special-attack": 105, "special-defense": 66, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_632.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_632.json
index d643ccd..ce2c4c8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_632.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_632.json
@@ -1,1 +1,1 @@
-{"name": "durant", "types": ["steel", "bug"], "stats": {"speed": 109, "special-defense": 48, "special-attack": 48, "defense": 112, "attack": 109, "hp": 58}}
\ No newline at end of file
+{"name": "durant", "types": ["bug", "steel"], "stats": {"hp": 58, "attack": 109, "defense": 112, "special-attack": 48, "special-defense": 48, "speed": 109}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_633.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_633.json
index 0e84ae1..97b1f35 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_633.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_633.json
@@ -1,1 +1,1 @@
-{"name": "deino", "types": ["dragon", "dark"], "stats": {"speed": 38, "special-defense": 50, "special-attack": 45, "defense": 50, "attack": 65, "hp": 52}}
\ No newline at end of file
+{"name": "deino", "types": ["dark", "dragon"], "stats": {"hp": 52, "attack": 65, "defense": 50, "special-attack": 45, "special-defense": 50, "speed": 38}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_634.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_634.json
index 1d1366c..107d52d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_634.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_634.json
@@ -1,1 +1,1 @@
-{"name": "zweilous", "types": ["dragon", "dark"], "stats": {"speed": 58, "special-defense": 70, "special-attack": 65, "defense": 70, "attack": 85, "hp": 72}}
\ No newline at end of file
+{"name": "zweilous", "types": ["dark", "dragon"], "stats": {"hp": 72, "attack": 85, "defense": 70, "special-attack": 65, "special-defense": 70, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_635.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_635.json
index 6c8c617..30114e5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_635.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_635.json
@@ -1,1 +1,1 @@
-{"name": "hydreigon", "types": ["dragon", "dark"], "stats": {"speed": 98, "special-defense": 90, "special-attack": 125, "defense": 90, "attack": 105, "hp": 92}}
\ No newline at end of file
+{"name": "hydreigon", "types": ["dark", "dragon"], "stats": {"hp": 92, "attack": 105, "defense": 90, "special-attack": 125, "special-defense": 90, "speed": 98}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_636.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_636.json
index 0846a77..c691905 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_636.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_636.json
@@ -1,1 +1,1 @@
-{"name": "larvesta", "types": ["fire", "bug"], "stats": {"speed": 60, "special-defense": 55, "special-attack": 50, "defense": 55, "attack": 85, "hp": 55}}
\ No newline at end of file
+{"name": "larvesta", "types": ["bug", "fire"], "stats": {"hp": 55, "attack": 85, "defense": 55, "special-attack": 50, "special-defense": 55, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_637.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_637.json
index 540892c..adcd992 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_637.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_637.json
@@ -1,1 +1,1 @@
-{"name": "volcarona", "types": ["fire", "bug"], "stats": {"speed": 100, "special-defense": 105, "special-attack": 135, "defense": 65, "attack": 60, "hp": 85}}
\ No newline at end of file
+{"name": "volcarona", "types": ["bug", "fire"], "stats": {"hp": 85, "attack": 60, "defense": 65, "special-attack": 135, "special-defense": 105, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_638.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_638.json
index 5d0966a..3136501 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_638.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_638.json
@@ -1,1 +1,1 @@
-{"name": "cobalion", "types": ["fighting", "steel"], "stats": {"speed": 108, "special-defense": 72, "special-attack": 90, "defense": 129, "attack": 90, "hp": 91}}
\ No newline at end of file
+{"name": "cobalion", "types": ["steel", "fighting"], "stats": {"hp": 91, "attack": 90, "defense": 129, "special-attack": 90, "special-defense": 72, "speed": 108}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_639.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_639.json
index 65516a4..20b0f5f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_639.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_639.json
@@ -1,1 +1,1 @@
-{"name": "terrakion", "types": ["fighting", "rock"], "stats": {"speed": 108, "special-defense": 90, "special-attack": 72, "defense": 90, "attack": 129, "hp": 91}}
\ No newline at end of file
+{"name": "terrakion", "types": ["rock", "fighting"], "stats": {"hp": 91, "attack": 129, "defense": 90, "special-attack": 72, "special-defense": 90, "speed": 108}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_64.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_64.json
index 8205be5..2fea660 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_64.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_64.json
@@ -1,1 +1,1 @@
-{"name": "kadabra", "types": ["psychic"], "stats": {"speed": 105, "special-defense": 70, "special-attack": 120, "defense": 30, "attack": 35, "hp": 40}}
\ No newline at end of file
+{"name": "kadabra", "types": ["psychic"], "stats": {"hp": 40, "attack": 35, "defense": 30, "special-attack": 120, "special-defense": 70, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_640.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_640.json
index 5ecc415..5f71b6f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_640.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_640.json
@@ -1,1 +1,1 @@
-{"name": "virizion", "types": ["fighting", "grass"], "stats": {"speed": 108, "special-defense": 129, "special-attack": 90, "defense": 72, "attack": 90, "hp": 91}}
\ No newline at end of file
+{"name": "virizion", "types": ["grass", "fighting"], "stats": {"hp": 91, "attack": 90, "defense": 72, "special-attack": 90, "special-defense": 129, "speed": 108}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_641.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_641.json
index b7d72b0..7585fb1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_641.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_641.json
@@ -1,1 +1,1 @@
-{"name": "tornadus-incarnate", "types": ["flying"], "stats": {"speed": 111, "special-defense": 80, "special-attack": 125, "defense": 70, "attack": 115, "hp": 79}}
\ No newline at end of file
+{"name": "tornadus-incarnate", "types": ["flying"], "stats": {"hp": 79, "attack": 115, "defense": 70, "special-attack": 125, "special-defense": 80, "speed": 111}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_642.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_642.json
index 6d27286..bbb40e6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_642.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_642.json
@@ -1,1 +1,1 @@
-{"name": "thundurus-incarnate", "types": ["flying", "electric"], "stats": {"speed": 111, "special-defense": 80, "special-attack": 125, "defense": 70, "attack": 115, "hp": 79}}
\ No newline at end of file
+{"name": "thundurus-incarnate", "types": ["electric", "flying"], "stats": {"hp": 79, "attack": 115, "defense": 70, "special-attack": 125, "special-defense": 80, "speed": 111}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_643.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_643.json
index 2e7f78f..eca47e4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_643.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_643.json
@@ -1,1 +1,1 @@
-{"name": "reshiram", "types": ["fire", "dragon"], "stats": {"speed": 90, "special-defense": 120, "special-attack": 150, "defense": 100, "attack": 120, "hp": 100}}
\ No newline at end of file
+{"name": "reshiram", "types": ["dragon", "fire"], "stats": {"hp": 100, "attack": 120, "defense": 100, "special-attack": 150, "special-defense": 120, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_644.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_644.json
index 482cf60..a0a2810 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_644.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_644.json
@@ -1,1 +1,1 @@
-{"name": "zekrom", "types": ["electric", "dragon"], "stats": {"speed": 90, "special-defense": 100, "special-attack": 120, "defense": 120, "attack": 150, "hp": 100}}
\ No newline at end of file
+{"name": "zekrom", "types": ["dragon", "electric"], "stats": {"hp": 100, "attack": 150, "defense": 120, "special-attack": 120, "special-defense": 100, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_645.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_645.json
index 3ccd982..f9c0d8e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_645.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_645.json
@@ -1,1 +1,1 @@
-{"name": "landorus-incarnate", "types": ["flying", "ground"], "stats": {"speed": 101, "special-defense": 80, "special-attack": 115, "defense": 90, "attack": 125, "hp": 89}}
\ No newline at end of file
+{"name": "landorus-incarnate", "types": ["ground", "flying"], "stats": {"hp": 89, "attack": 125, "defense": 90, "special-attack": 115, "special-defense": 80, "speed": 101}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_646.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_646.json
index 7924f2f..188a74f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_646.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_646.json
@@ -1,1 +1,1 @@
-{"name": "kyurem", "types": ["ice", "dragon"], "stats": {"speed": 95, "special-defense": 90, "special-attack": 130, "defense": 90, "attack": 130, "hp": 125}}
\ No newline at end of file
+{"name": "kyurem", "types": ["dragon", "ice"], "stats": {"hp": 125, "attack": 130, "defense": 90, "special-attack": 130, "special-defense": 90, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_647.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_647.json
index 3c45333..452392f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_647.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_647.json
@@ -1,1 +1,1 @@
-{"name": "keldeo-ordinary", "types": ["fighting", "water"], "stats": {"speed": 108, "special-defense": 90, "special-attack": 129, "defense": 90, "attack": 72, "hp": 91}}
\ No newline at end of file
+{"name": "keldeo-ordinary", "types": ["water", "fighting"], "stats": {"hp": 91, "attack": 72, "defense": 90, "special-attack": 129, "special-defense": 90, "speed": 108}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_648.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_648.json
index 950f919..c816feb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_648.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_648.json
@@ -1,1 +1,1 @@
-{"name": "meloetta-aria", "types": ["psychic", "normal"], "stats": {"speed": 90, "special-defense": 128, "special-attack": 128, "defense": 77, "attack": 77, "hp": 100}}
\ No newline at end of file
+{"name": "meloetta-aria", "types": ["normal", "psychic"], "stats": {"hp": 100, "attack": 77, "defense": 77, "special-attack": 128, "special-defense": 128, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_649.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_649.json
index 98b72e5..c77ea7f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_649.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_649.json
@@ -1,1 +1,1 @@
-{"name": "genesect", "types": ["steel", "bug"], "stats": {"speed": 99, "special-defense": 95, "special-attack": 120, "defense": 95, "attack": 120, "hp": 71}}
\ No newline at end of file
+{"name": "genesect", "types": ["bug", "steel"], "stats": {"hp": 71, "attack": 120, "defense": 95, "special-attack": 120, "special-defense": 95, "speed": 99}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_65.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_65.json
index e481e9b..79266ef 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_65.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_65.json
@@ -1,1 +1,1 @@
-{"name": "alakazam", "types": ["psychic"], "stats": {"speed": 120, "special-defense": 95, "special-attack": 135, "defense": 45, "attack": 50, "hp": 55}}
\ No newline at end of file
+{"name": "alakazam", "types": ["psychic"], "stats": {"hp": 55, "attack": 50, "defense": 45, "special-attack": 135, "special-defense": 95, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_650.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_650.json
index a1b87c7..cc9c3da 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_650.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_650.json
@@ -1,1 +1,1 @@
-{"name": "chespin", "types": ["grass"], "stats": {"speed": 38, "special-defense": 45, "special-attack": 48, "defense": 65, "attack": 61, "hp": 56}}
\ No newline at end of file
+{"name": "chespin", "types": ["grass"], "stats": {"hp": 56, "attack": 61, "defense": 65, "special-attack": 48, "special-defense": 45, "speed": 38}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_651.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_651.json
index 506baae..a5ce386 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_651.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_651.json
@@ -1,1 +1,1 @@
-{"name": "quilladin", "types": ["grass"], "stats": {"speed": 57, "special-defense": 58, "special-attack": 56, "defense": 95, "attack": 78, "hp": 61}}
\ No newline at end of file
+{"name": "quilladin", "types": ["grass"], "stats": {"hp": 61, "attack": 78, "defense": 95, "special-attack": 56, "special-defense": 58, "speed": 57}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_652.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_652.json
index a5f6c3d..4fde817 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_652.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_652.json
@@ -1,1 +1,1 @@
-{"name": "chesnaught", "types": ["fighting", "grass"], "stats": {"speed": 64, "special-defense": 75, "special-attack": 74, "defense": 122, "attack": 107, "hp": 88}}
\ No newline at end of file
+{"name": "chesnaught", "types": ["grass", "fighting"], "stats": {"hp": 88, "attack": 107, "defense": 122, "special-attack": 74, "special-defense": 75, "speed": 64}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_653.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_653.json
index e1695ed..d1f39ee 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_653.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_653.json
@@ -1,1 +1,1 @@
-{"name": "fennekin", "types": ["fire"], "stats": {"speed": 60, "special-defense": 60, "special-attack": 62, "defense": 40, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "fennekin", "types": ["fire"], "stats": {"hp": 40, "attack": 45, "defense": 40, "special-attack": 62, "special-defense": 60, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_654.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_654.json
index 47d2bc6..e1f1e61 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_654.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_654.json
@@ -1,1 +1,1 @@
-{"name": "braixen", "types": ["fire"], "stats": {"speed": 73, "special-defense": 70, "special-attack": 90, "defense": 58, "attack": 59, "hp": 59}}
\ No newline at end of file
+{"name": "braixen", "types": ["fire"], "stats": {"hp": 59, "attack": 59, "defense": 58, "special-attack": 90, "special-defense": 70, "speed": 73}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_655.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_655.json
index ffaadd7..d291416 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_655.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_655.json
@@ -1,1 +1,1 @@
-{"name": "delphox", "types": ["psychic", "fire"], "stats": {"speed": 104, "special-defense": 100, "special-attack": 114, "defense": 72, "attack": 69, "hp": 75}}
\ No newline at end of file
+{"name": "delphox", "types": ["fire", "psychic"], "stats": {"hp": 75, "attack": 69, "defense": 72, "special-attack": 114, "special-defense": 100, "speed": 104}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_656.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_656.json
index 6fae0b8..3504474 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_656.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_656.json
@@ -1,1 +1,1 @@
-{"name": "froakie", "types": ["water"], "stats": {"speed": 71, "special-defense": 44, "special-attack": 62, "defense": 40, "attack": 56, "hp": 41}}
\ No newline at end of file
+{"name": "froakie", "types": ["water"], "stats": {"hp": 41, "attack": 56, "defense": 40, "special-attack": 62, "special-defense": 44, "speed": 71}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_657.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_657.json
index 43df65f..63fb26b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_657.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_657.json
@@ -1,1 +1,1 @@
-{"name": "frogadier", "types": ["water"], "stats": {"speed": 97, "special-defense": 56, "special-attack": 83, "defense": 52, "attack": 63, "hp": 54}}
\ No newline at end of file
+{"name": "frogadier", "types": ["water"], "stats": {"hp": 54, "attack": 63, "defense": 52, "special-attack": 83, "special-defense": 56, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_658.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_658.json
index b47207d..c09467d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_658.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_658.json
@@ -1,1 +1,1 @@
-{"name": "greninja", "types": ["dark", "water"], "stats": {"speed": 122, "special-defense": 71, "special-attack": 103, "defense": 67, "attack": 95, "hp": 72}}
\ No newline at end of file
+{"name": "greninja", "types": ["water", "dark"], "stats": {"hp": 72, "attack": 95, "defense": 67, "special-attack": 103, "special-defense": 71, "speed": 122}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_659.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_659.json
index cac06c3..a4d1ac0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_659.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_659.json
@@ -1,1 +1,1 @@
-{"name": "bunnelby", "types": ["normal"], "stats": {"speed": 57, "special-defense": 36, "special-attack": 32, "defense": 38, "attack": 36, "hp": 38}}
\ No newline at end of file
+{"name": "bunnelby", "types": ["normal"], "stats": {"hp": 38, "attack": 36, "defense": 38, "special-attack": 32, "special-defense": 36, "speed": 57}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_66.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_66.json
index 8e9bcce..bee37b0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_66.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_66.json
@@ -1,1 +1,1 @@
-{"name": "machop", "types": ["fighting"], "stats": {"speed": 35, "special-defense": 35, "special-attack": 35, "defense": 50, "attack": 80, "hp": 70}}
\ No newline at end of file
+{"name": "machop", "types": ["fighting"], "stats": {"hp": 70, "attack": 80, "defense": 50, "special-attack": 35, "special-defense": 35, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_660.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_660.json
index eff3c30..deb0c03 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_660.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_660.json
@@ -1,1 +1,1 @@
-{"name": "diggersby", "types": ["ground", "normal"], "stats": {"speed": 78, "special-defense": 77, "special-attack": 50, "defense": 77, "attack": 56, "hp": 85}}
\ No newline at end of file
+{"name": "diggersby", "types": ["normal", "ground"], "stats": {"hp": 85, "attack": 56, "defense": 77, "special-attack": 50, "special-defense": 77, "speed": 78}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_661.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_661.json
index b663650..02abca6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_661.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_661.json
@@ -1,1 +1,1 @@
-{"name": "fletchling", "types": ["flying", "normal"], "stats": {"speed": 62, "special-defense": 38, "special-attack": 40, "defense": 43, "attack": 50, "hp": 45}}
\ No newline at end of file
+{"name": "fletchling", "types": ["normal", "flying"], "stats": {"hp": 45, "attack": 50, "defense": 43, "special-attack": 40, "special-defense": 38, "speed": 62}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_662.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_662.json
index f865e07..8e2b1bf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_662.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_662.json
@@ -1,1 +1,1 @@
-{"name": "fletchinder", "types": ["flying", "fire"], "stats": {"speed": 84, "special-defense": 52, "special-attack": 56, "defense": 55, "attack": 73, "hp": 62}}
\ No newline at end of file
+{"name": "fletchinder", "types": ["fire", "flying"], "stats": {"hp": 62, "attack": 73, "defense": 55, "special-attack": 56, "special-defense": 52, "speed": 84}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_663.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_663.json
index c027e7e..9fbd987 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_663.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_663.json
@@ -1,1 +1,1 @@
-{"name": "talonflame", "types": ["flying", "fire"], "stats": {"speed": 126, "special-defense": 69, "special-attack": 74, "defense": 71, "attack": 81, "hp": 78}}
\ No newline at end of file
+{"name": "talonflame", "types": ["fire", "flying"], "stats": {"hp": 78, "attack": 81, "defense": 71, "special-attack": 74, "special-defense": 69, "speed": 126}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_664.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_664.json
index 233385e..c44f2a0 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_664.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_664.json
@@ -1,1 +1,1 @@
-{"name": "scatterbug", "types": ["bug"], "stats": {"speed": 35, "special-defense": 25, "special-attack": 27, "defense": 40, "attack": 35, "hp": 38}}
\ No newline at end of file
+{"name": "scatterbug", "types": ["bug"], "stats": {"hp": 38, "attack": 35, "defense": 40, "special-attack": 27, "special-defense": 25, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_665.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_665.json
index 3606385..7e65681 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_665.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_665.json
@@ -1,1 +1,1 @@
-{"name": "spewpa", "types": ["bug"], "stats": {"speed": 29, "special-defense": 30, "special-attack": 27, "defense": 60, "attack": 22, "hp": 45}}
\ No newline at end of file
+{"name": "spewpa", "types": ["bug"], "stats": {"hp": 45, "attack": 22, "defense": 60, "special-attack": 27, "special-defense": 30, "speed": 29}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_666.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_666.json
index bd85475..36dcb9b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_666.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_666.json
@@ -1,1 +1,1 @@
-{"name": "vivillon", "types": ["flying", "bug"], "stats": {"speed": 89, "special-defense": 50, "special-attack": 90, "defense": 50, "attack": 52, "hp": 80}}
\ No newline at end of file
+{"name": "vivillon", "types": ["bug", "flying"], "stats": {"hp": 80, "attack": 52, "defense": 50, "special-attack": 90, "special-defense": 50, "speed": 89}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_667.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_667.json
index fbfae5a..ac94145 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_667.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_667.json
@@ -1,1 +1,1 @@
-{"name": "litleo", "types": ["normal", "fire"], "stats": {"speed": 72, "special-defense": 54, "special-attack": 73, "defense": 58, "attack": 50, "hp": 62}}
\ No newline at end of file
+{"name": "litleo", "types": ["fire", "normal"], "stats": {"hp": 62, "attack": 50, "defense": 58, "special-attack": 73, "special-defense": 54, "speed": 72}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_668.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_668.json
index 9171047..6acfe60 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_668.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_668.json
@@ -1,1 +1,1 @@
-{"name": "pyroar", "types": ["normal", "fire"], "stats": {"speed": 106, "special-defense": 66, "special-attack": 109, "defense": 72, "attack": 68, "hp": 86}}
\ No newline at end of file
+{"name": "pyroar", "types": ["fire", "normal"], "stats": {"hp": 86, "attack": 68, "defense": 72, "special-attack": 109, "special-defense": 66, "speed": 106}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_669.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_669.json
index 729c3ec..f247a9a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_669.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_669.json
@@ -1,1 +1,1 @@
-{"name": "flabebe", "types": ["fairy"], "stats": {"speed": 42, "special-defense": 79, "special-attack": 61, "defense": 39, "attack": 38, "hp": 44}}
\ No newline at end of file
+{"name": "flabebe", "types": ["fairy"], "stats": {"hp": 44, "attack": 38, "defense": 39, "special-attack": 61, "special-defense": 79, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_67.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_67.json
index a1283ad..8712e07 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_67.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_67.json
@@ -1,1 +1,1 @@
-{"name": "machoke", "types": ["fighting"], "stats": {"speed": 45, "special-defense": 60, "special-attack": 50, "defense": 70, "attack": 100, "hp": 80}}
\ No newline at end of file
+{"name": "machoke", "types": ["fighting"], "stats": {"hp": 80, "attack": 100, "defense": 70, "special-attack": 50, "special-defense": 60, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_670.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_670.json
index f7ea515..aa03d57 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_670.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_670.json
@@ -1,1 +1,1 @@
-{"name": "floette", "types": ["fairy"], "stats": {"speed": 52, "special-defense": 98, "special-attack": 75, "defense": 47, "attack": 45, "hp": 54}}
\ No newline at end of file
+{"name": "floette", "types": ["fairy"], "stats": {"hp": 54, "attack": 45, "defense": 47, "special-attack": 75, "special-defense": 98, "speed": 52}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_671.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_671.json
index df45553..9388b56 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_671.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_671.json
@@ -1,1 +1,1 @@
-{"name": "florges", "types": ["fairy"], "stats": {"speed": 75, "special-defense": 154, "special-attack": 112, "defense": 68, "attack": 65, "hp": 78}}
\ No newline at end of file
+{"name": "florges", "types": ["fairy"], "stats": {"hp": 78, "attack": 65, "defense": 68, "special-attack": 112, "special-defense": 154, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_672.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_672.json
index 7e6a154..a943ddf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_672.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_672.json
@@ -1,1 +1,1 @@
-{"name": "skiddo", "types": ["grass"], "stats": {"speed": 52, "special-defense": 57, "special-attack": 62, "defense": 48, "attack": 65, "hp": 66}}
\ No newline at end of file
+{"name": "skiddo", "types": ["grass"], "stats": {"hp": 66, "attack": 65, "defense": 48, "special-attack": 62, "special-defense": 57, "speed": 52}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_673.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_673.json
index 60f5c86..094f046 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_673.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_673.json
@@ -1,1 +1,1 @@
-{"name": "gogoat", "types": ["grass"], "stats": {"speed": 68, "special-defense": 81, "special-attack": 97, "defense": 62, "attack": 100, "hp": 123}}
\ No newline at end of file
+{"name": "gogoat", "types": ["grass"], "stats": {"hp": 123, "attack": 100, "defense": 62, "special-attack": 97, "special-defense": 81, "speed": 68}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_674.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_674.json
index e3e1982..5a70eb7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_674.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_674.json
@@ -1,1 +1,1 @@
-{"name": "pancham", "types": ["fighting"], "stats": {"speed": 43, "special-defense": 48, "special-attack": 46, "defense": 62, "attack": 82, "hp": 67}}
\ No newline at end of file
+{"name": "pancham", "types": ["fighting"], "stats": {"hp": 67, "attack": 82, "defense": 62, "special-attack": 46, "special-defense": 48, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_675.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_675.json
index 6decbcf..51ec28d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_675.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_675.json
@@ -1,1 +1,1 @@
-{"name": "pangoro", "types": ["dark", "fighting"], "stats": {"speed": 58, "special-defense": 71, "special-attack": 69, "defense": 78, "attack": 124, "hp": 95}}
\ No newline at end of file
+{"name": "pangoro", "types": ["fighting", "dark"], "stats": {"hp": 95, "attack": 124, "defense": 78, "special-attack": 69, "special-defense": 71, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_676.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_676.json
index 78c0315..5094b50 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_676.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_676.json
@@ -1,1 +1,1 @@
-{"name": "furfrou", "types": ["normal"], "stats": {"speed": 102, "special-defense": 90, "special-attack": 65, "defense": 60, "attack": 80, "hp": 75}}
\ No newline at end of file
+{"name": "furfrou", "types": ["normal"], "stats": {"hp": 75, "attack": 80, "defense": 60, "special-attack": 65, "special-defense": 90, "speed": 102}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_677.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_677.json
index af6ba95..3ce606f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_677.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_677.json
@@ -1,1 +1,1 @@
-{"name": "espurr", "types": ["psychic"], "stats": {"speed": 68, "special-defense": 60, "special-attack": 63, "defense": 54, "attack": 48, "hp": 62}}
\ No newline at end of file
+{"name": "espurr", "types": ["psychic"], "stats": {"hp": 62, "attack": 48, "defense": 54, "special-attack": 63, "special-defense": 60, "speed": 68}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_678.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_678.json
index 2f42e80..28cc2f3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_678.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_678.json
@@ -1,1 +1,1 @@
-{"name": "meowstic-male", "types": ["psychic"], "stats": {"speed": 104, "special-defense": 81, "special-attack": 83, "defense": 76, "attack": 48, "hp": 74}}
\ No newline at end of file
+{"name": "meowstic-male", "types": ["psychic"], "stats": {"hp": 74, "attack": 48, "defense": 76, "special-attack": 83, "special-defense": 81, "speed": 104}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_679.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_679.json
index ac26c12..53aea2c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_679.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_679.json
@@ -1,1 +1,1 @@
-{"name": "honedge", "types": ["ghost", "steel"], "stats": {"speed": 28, "special-defense": 37, "special-attack": 35, "defense": 100, "attack": 80, "hp": 45}}
\ No newline at end of file
+{"name": "honedge", "types": ["steel", "ghost"], "stats": {"hp": 45, "attack": 80, "defense": 100, "special-attack": 35, "special-defense": 37, "speed": 28}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_68.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_68.json
index f739c71..1f869cd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_68.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_68.json
@@ -1,1 +1,1 @@
-{"name": "machamp", "types": ["fighting"], "stats": {"speed": 55, "special-defense": 85, "special-attack": 65, "defense": 80, "attack": 130, "hp": 90}}
\ No newline at end of file
+{"name": "machamp", "types": ["fighting"], "stats": {"hp": 90, "attack": 130, "defense": 80, "special-attack": 65, "special-defense": 85, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_680.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_680.json
index 5e713bb..0ace845 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_680.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_680.json
@@ -1,1 +1,1 @@
-{"name": "doublade", "types": ["ghost", "steel"], "stats": {"speed": 35, "special-defense": 49, "special-attack": 45, "defense": 150, "attack": 110, "hp": 59}}
\ No newline at end of file
+{"name": "doublade", "types": ["steel", "ghost"], "stats": {"hp": 59, "attack": 110, "defense": 150, "special-attack": 45, "special-defense": 49, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_681.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_681.json
index 2e1a3fa..ec034a1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_681.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_681.json
@@ -1,1 +1,1 @@
-{"name": "aegislash-shield", "types": ["ghost", "steel"], "stats": {"speed": 60, "special-defense": 150, "special-attack": 50, "defense": 150, "attack": 50, "hp": 60}}
\ No newline at end of file
+{"name": "aegislash-shield", "types": ["steel", "ghost"], "stats": {"hp": 60, "attack": 50, "defense": 150, "special-attack": 50, "special-defense": 150, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_682.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_682.json
index 1560539..01c2494 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_682.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_682.json
@@ -1,1 +1,1 @@
-{"name": "spritzee", "types": ["fairy"], "stats": {"speed": 23, "special-defense": 65, "special-attack": 63, "defense": 60, "attack": 52, "hp": 78}}
\ No newline at end of file
+{"name": "spritzee", "types": ["fairy"], "stats": {"hp": 78, "attack": 52, "defense": 60, "special-attack": 63, "special-defense": 65, "speed": 23}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_683.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_683.json
index cab44b6..f311df2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_683.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_683.json
@@ -1,1 +1,1 @@
-{"name": "aromatisse", "types": ["fairy"], "stats": {"speed": 29, "special-defense": 89, "special-attack": 99, "defense": 72, "attack": 72, "hp": 101}}
\ No newline at end of file
+{"name": "aromatisse", "types": ["fairy"], "stats": {"hp": 101, "attack": 72, "defense": 72, "special-attack": 99, "special-defense": 89, "speed": 29}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_684.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_684.json
index 6efe24d..a7b1a46 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_684.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_684.json
@@ -1,1 +1,1 @@
-{"name": "swirlix", "types": ["fairy"], "stats": {"speed": 49, "special-defense": 57, "special-attack": 59, "defense": 66, "attack": 48, "hp": 62}}
\ No newline at end of file
+{"name": "swirlix", "types": ["fairy"], "stats": {"hp": 62, "attack": 48, "defense": 66, "special-attack": 59, "special-defense": 57, "speed": 49}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_685.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_685.json
index 1c13a90..a3e4c4d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_685.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_685.json
@@ -1,1 +1,1 @@
-{"name": "slurpuff", "types": ["fairy"], "stats": {"speed": 72, "special-defense": 75, "special-attack": 85, "defense": 86, "attack": 80, "hp": 82}}
\ No newline at end of file
+{"name": "slurpuff", "types": ["fairy"], "stats": {"hp": 82, "attack": 80, "defense": 86, "special-attack": 85, "special-defense": 75, "speed": 72}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_686.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_686.json
index 9370b2e..3386a03 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_686.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_686.json
@@ -1,1 +1,1 @@
-{"name": "inkay", "types": ["psychic", "dark"], "stats": {"speed": 45, "special-defense": 46, "special-attack": 37, "defense": 53, "attack": 54, "hp": 53}}
\ No newline at end of file
+{"name": "inkay", "types": ["dark", "psychic"], "stats": {"hp": 53, "attack": 54, "defense": 53, "special-attack": 37, "special-defense": 46, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_687.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_687.json
index 235b4a5..5163209 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_687.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_687.json
@@ -1,1 +1,1 @@
-{"name": "malamar", "types": ["psychic", "dark"], "stats": {"speed": 73, "special-defense": 75, "special-attack": 68, "defense": 88, "attack": 92, "hp": 86}}
\ No newline at end of file
+{"name": "malamar", "types": ["dark", "psychic"], "stats": {"hp": 86, "attack": 92, "defense": 88, "special-attack": 68, "special-defense": 75, "speed": 73}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_688.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_688.json
index 83552ea..70f96a5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_688.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_688.json
@@ -1,1 +1,1 @@
-{"name": "binacle", "types": ["water", "rock"], "stats": {"speed": 50, "special-defense": 56, "special-attack": 39, "defense": 67, "attack": 52, "hp": 42}}
\ No newline at end of file
+{"name": "binacle", "types": ["rock", "water"], "stats": {"hp": 42, "attack": 52, "defense": 67, "special-attack": 39, "special-defense": 56, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_689.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_689.json
index db81322..5f0cf4c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_689.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_689.json
@@ -1,1 +1,1 @@
-{"name": "barbaracle", "types": ["water", "rock"], "stats": {"speed": 68, "special-defense": 86, "special-attack": 54, "defense": 115, "attack": 105, "hp": 72}}
\ No newline at end of file
+{"name": "barbaracle", "types": ["rock", "water"], "stats": {"hp": 72, "attack": 105, "defense": 115, "special-attack": 54, "special-defense": 86, "speed": 68}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_69.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_69.json
index 65b4ef9..308eed9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_69.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_69.json
@@ -1,1 +1,1 @@
-{"name": "bellsprout", "types": ["poison", "grass"], "stats": {"speed": 40, "special-defense": 30, "special-attack": 70, "defense": 35, "attack": 75, "hp": 50}}
\ No newline at end of file
+{"name": "bellsprout", "types": ["grass", "poison"], "stats": {"hp": 50, "attack": 75, "defense": 35, "special-attack": 70, "special-defense": 30, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_690.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_690.json
index 906d2e4..0a98881 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_690.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_690.json
@@ -1,1 +1,1 @@
-{"name": "skrelp", "types": ["water", "poison"], "stats": {"speed": 30, "special-defense": 60, "special-attack": 60, "defense": 60, "attack": 60, "hp": 50}}
\ No newline at end of file
+{"name": "skrelp", "types": ["poison", "water"], "stats": {"hp": 50, "attack": 60, "defense": 60, "special-attack": 60, "special-defense": 60, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_691.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_691.json
index e9620a0..69632e9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_691.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_691.json
@@ -1,1 +1,1 @@
-{"name": "dragalge", "types": ["dragon", "poison"], "stats": {"speed": 44, "special-defense": 123, "special-attack": 97, "defense": 90, "attack": 75, "hp": 65}}
\ No newline at end of file
+{"name": "dragalge", "types": ["poison", "dragon"], "stats": {"hp": 65, "attack": 75, "defense": 90, "special-attack": 97, "special-defense": 123, "speed": 44}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_692.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_692.json
index 88e59d8..947f446 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_692.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_692.json
@@ -1,1 +1,1 @@
-{"name": "clauncher", "types": ["water"], "stats": {"speed": 44, "special-defense": 63, "special-attack": 58, "defense": 62, "attack": 53, "hp": 50}}
\ No newline at end of file
+{"name": "clauncher", "types": ["water"], "stats": {"hp": 50, "attack": 53, "defense": 62, "special-attack": 58, "special-defense": 63, "speed": 44}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_693.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_693.json
index f5f9f04..5e96ee1 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_693.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_693.json
@@ -1,1 +1,1 @@
-{"name": "clawitzer", "types": ["water"], "stats": {"speed": 59, "special-defense": 89, "special-attack": 120, "defense": 88, "attack": 73, "hp": 71}}
\ No newline at end of file
+{"name": "clawitzer", "types": ["water"], "stats": {"hp": 71, "attack": 73, "defense": 88, "special-attack": 120, "special-defense": 89, "speed": 59}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_694.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_694.json
index ded97be..879d427 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_694.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_694.json
@@ -1,1 +1,1 @@
-{"name": "helioptile", "types": ["normal", "electric"], "stats": {"speed": 70, "special-defense": 43, "special-attack": 61, "defense": 33, "attack": 38, "hp": 44}}
\ No newline at end of file
+{"name": "helioptile", "types": ["electric", "normal"], "stats": {"hp": 44, "attack": 38, "defense": 33, "special-attack": 61, "special-defense": 43, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_695.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_695.json
index 8996bd0..f91e478 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_695.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_695.json
@@ -1,1 +1,1 @@
-{"name": "heliolisk", "types": ["normal", "electric"], "stats": {"speed": 109, "special-defense": 94, "special-attack": 109, "defense": 52, "attack": 55, "hp": 62}}
\ No newline at end of file
+{"name": "heliolisk", "types": ["electric", "normal"], "stats": {"hp": 62, "attack": 55, "defense": 52, "special-attack": 109, "special-defense": 94, "speed": 109}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_696.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_696.json
index f116263..92086d3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_696.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_696.json
@@ -1,1 +1,1 @@
-{"name": "tyrunt", "types": ["dragon", "rock"], "stats": {"speed": 48, "special-defense": 45, "special-attack": 45, "defense": 77, "attack": 89, "hp": 58}}
\ No newline at end of file
+{"name": "tyrunt", "types": ["rock", "dragon"], "stats": {"hp": 58, "attack": 89, "defense": 77, "special-attack": 45, "special-defense": 45, "speed": 48}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_697.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_697.json
index 456c9d7..e2f20a2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_697.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_697.json
@@ -1,1 +1,1 @@
-{"name": "tyrantrum", "types": ["dragon", "rock"], "stats": {"speed": 71, "special-defense": 59, "special-attack": 69, "defense": 119, "attack": 121, "hp": 82}}
\ No newline at end of file
+{"name": "tyrantrum", "types": ["rock", "dragon"], "stats": {"hp": 82, "attack": 121, "defense": 119, "special-attack": 69, "special-defense": 59, "speed": 71}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_698.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_698.json
index c7a26bc..387567b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_698.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_698.json
@@ -1,1 +1,1 @@
-{"name": "amaura", "types": ["ice", "rock"], "stats": {"speed": 46, "special-defense": 63, "special-attack": 67, "defense": 50, "attack": 59, "hp": 77}}
\ No newline at end of file
+{"name": "amaura", "types": ["rock", "ice"], "stats": {"hp": 77, "attack": 59, "defense": 50, "special-attack": 67, "special-defense": 63, "speed": 46}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_699.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_699.json
index d2279e5..622bae8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_699.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_699.json
@@ -1,1 +1,1 @@
-{"name": "aurorus", "types": ["ice", "rock"], "stats": {"speed": 58, "special-defense": 92, "special-attack": 99, "defense": 72, "attack": 77, "hp": 123}}
\ No newline at end of file
+{"name": "aurorus", "types": ["rock", "ice"], "stats": {"hp": 123, "attack": 77, "defense": 72, "special-attack": 99, "special-defense": 92, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_7.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_7.json
index d1e18f3..95a39e9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_7.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_7.json
@@ -1,1 +1,1 @@
-{"name": "squirtle", "types": ["water"], "stats": {"speed": 43, "special-defense": 64, "special-attack": 50, "defense": 65, "attack": 48, "hp": 44}}
\ No newline at end of file
+{"name": "squirtle", "types": ["water"], "stats": {"hp": 44, "attack": 48, "defense": 65, "special-attack": 50, "special-defense": 64, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_70.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_70.json
index fd14800..6530d4f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_70.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_70.json
@@ -1,1 +1,1 @@
-{"name": "weepinbell", "types": ["poison", "grass"], "stats": {"speed": 55, "special-defense": 45, "special-attack": 85, "defense": 50, "attack": 90, "hp": 65}}
\ No newline at end of file
+{"name": "weepinbell", "types": ["grass", "poison"], "stats": {"hp": 65, "attack": 90, "defense": 50, "special-attack": 85, "special-defense": 45, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_700.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_700.json
index 979111b..d9c8c31 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_700.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_700.json
@@ -1,1 +1,1 @@
-{"name": "sylveon", "types": ["fairy"], "stats": {"speed": 60, "special-defense": 130, "special-attack": 110, "defense": 65, "attack": 65, "hp": 95}}
\ No newline at end of file
+{"name": "sylveon", "types": ["fairy"], "stats": {"hp": 95, "attack": 65, "defense": 65, "special-attack": 110, "special-defense": 130, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_701.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_701.json
index 68dbcde..ea6ebb7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_701.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_701.json
@@ -1,1 +1,1 @@
-{"name": "hawlucha", "types": ["flying", "fighting"], "stats": {"speed": 118, "special-defense": 63, "special-attack": 74, "defense": 75, "attack": 92, "hp": 78}}
\ No newline at end of file
+{"name": "hawlucha", "types": ["fighting", "flying"], "stats": {"hp": 78, "attack": 92, "defense": 75, "special-attack": 74, "special-defense": 63, "speed": 118}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_702.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_702.json
index 19746eb..d4c5a1b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_702.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_702.json
@@ -1,1 +1,1 @@
-{"name": "dedenne", "types": ["fairy", "electric"], "stats": {"speed": 101, "special-defense": 67, "special-attack": 81, "defense": 57, "attack": 58, "hp": 67}}
\ No newline at end of file
+{"name": "dedenne", "types": ["electric", "fairy"], "stats": {"hp": 67, "attack": 58, "defense": 57, "special-attack": 81, "special-defense": 67, "speed": 101}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_703.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_703.json
index a6cb59d..efc5710 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_703.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_703.json
@@ -1,1 +1,1 @@
-{"name": "carbink", "types": ["fairy", "rock"], "stats": {"speed": 50, "special-defense": 150, "special-attack": 50, "defense": 150, "attack": 50, "hp": 50}}
\ No newline at end of file
+{"name": "carbink", "types": ["rock", "fairy"], "stats": {"hp": 50, "attack": 50, "defense": 150, "special-attack": 50, "special-defense": 150, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_704.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_704.json
index 52050b8..7b06ffb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_704.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_704.json
@@ -1,1 +1,1 @@
-{"name": "goomy", "types": ["dragon"], "stats": {"speed": 40, "special-defense": 75, "special-attack": 55, "defense": 35, "attack": 50, "hp": 45}}
\ No newline at end of file
+{"name": "goomy", "types": ["dragon"], "stats": {"hp": 45, "attack": 50, "defense": 35, "special-attack": 55, "special-defense": 75, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_705.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_705.json
index deeb4bb..0631d05 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_705.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_705.json
@@ -1,1 +1,1 @@
-{"name": "sliggoo", "types": ["dragon"], "stats": {"speed": 60, "special-defense": 113, "special-attack": 83, "defense": 53, "attack": 75, "hp": 68}}
\ No newline at end of file
+{"name": "sliggoo", "types": ["dragon"], "stats": {"hp": 68, "attack": 75, "defense": 53, "special-attack": 83, "special-defense": 113, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_706.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_706.json
index 6266110..b124990 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_706.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_706.json
@@ -1,1 +1,1 @@
-{"name": "goodra", "types": ["dragon"], "stats": {"speed": 80, "special-defense": 150, "special-attack": 110, "defense": 70, "attack": 100, "hp": 90}}
\ No newline at end of file
+{"name": "goodra", "types": ["dragon"], "stats": {"hp": 90, "attack": 100, "defense": 70, "special-attack": 110, "special-defense": 150, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_707.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_707.json
index 3bee66d..55b35c5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_707.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_707.json
@@ -1,1 +1,1 @@
-{"name": "klefki", "types": ["fairy", "steel"], "stats": {"speed": 75, "special-defense": 87, "special-attack": 80, "defense": 91, "attack": 80, "hp": 57}}
\ No newline at end of file
+{"name": "klefki", "types": ["steel", "fairy"], "stats": {"hp": 57, "attack": 80, "defense": 91, "special-attack": 80, "special-defense": 87, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_708.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_708.json
index 83201fe..c327306 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_708.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_708.json
@@ -1,1 +1,1 @@
-{"name": "phantump", "types": ["grass", "ghost"], "stats": {"speed": 38, "special-defense": 60, "special-attack": 50, "defense": 48, "attack": 70, "hp": 43}}
\ No newline at end of file
+{"name": "phantump", "types": ["ghost", "grass"], "stats": {"hp": 43, "attack": 70, "defense": 48, "special-attack": 50, "special-defense": 60, "speed": 38}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_709.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_709.json
index 311eee4..c786cb4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_709.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_709.json
@@ -1,1 +1,1 @@
-{"name": "trevenant", "types": ["grass", "ghost"], "stats": {"speed": 56, "special-defense": 82, "special-attack": 65, "defense": 76, "attack": 110, "hp": 85}}
\ No newline at end of file
+{"name": "trevenant", "types": ["ghost", "grass"], "stats": {"hp": 85, "attack": 110, "defense": 76, "special-attack": 65, "special-defense": 82, "speed": 56}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_71.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_71.json
index 6dd0bac..8e878a3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_71.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_71.json
@@ -1,1 +1,1 @@
-{"name": "victreebel", "types": ["poison", "grass"], "stats": {"speed": 70, "special-defense": 70, "special-attack": 100, "defense": 65, "attack": 105, "hp": 80}}
\ No newline at end of file
+{"name": "victreebel", "types": ["grass", "poison"], "stats": {"hp": 80, "attack": 105, "defense": 65, "special-attack": 100, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_710.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_710.json
index 5eeee01..8712230 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_710.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_710.json
@@ -1,1 +1,1 @@
-{"name": "pumpkaboo-average", "types": ["grass", "ghost"], "stats": {"speed": 51, "special-defense": 55, "special-attack": 44, "defense": 70, "attack": 66, "hp": 49}}
\ No newline at end of file
+{"name": "pumpkaboo-average", "types": ["ghost", "grass"], "stats": {"hp": 49, "attack": 66, "defense": 70, "special-attack": 44, "special-defense": 55, "speed": 51}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_711.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_711.json
index 0a80734..9b8dc8a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_711.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_711.json
@@ -1,1 +1,1 @@
-{"name": "gourgeist-average", "types": ["grass", "ghost"], "stats": {"speed": 84, "special-defense": 75, "special-attack": 58, "defense": 122, "attack": 90, "hp": 65}}
\ No newline at end of file
+{"name": "gourgeist-average", "types": ["ghost", "grass"], "stats": {"hp": 65, "attack": 90, "defense": 122, "special-attack": 58, "special-defense": 75, "speed": 84}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_712.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_712.json
index 08fbea3..a7d8451 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_712.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_712.json
@@ -1,1 +1,1 @@
-{"name": "bergmite", "types": ["ice"], "stats": {"speed": 28, "special-defense": 35, "special-attack": 32, "defense": 85, "attack": 69, "hp": 55}}
\ No newline at end of file
+{"name": "bergmite", "types": ["ice"], "stats": {"hp": 55, "attack": 69, "defense": 85, "special-attack": 32, "special-defense": 35, "speed": 28}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_713.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_713.json
index 14f5000..c3bfdbc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_713.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_713.json
@@ -1,1 +1,1 @@
-{"name": "avalugg", "types": ["ice"], "stats": {"speed": 28, "special-defense": 46, "special-attack": 44, "defense": 184, "attack": 117, "hp": 95}}
\ No newline at end of file
+{"name": "avalugg", "types": ["ice"], "stats": {"hp": 95, "attack": 117, "defense": 184, "special-attack": 44, "special-defense": 46, "speed": 28}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_714.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_714.json
index c54ae9a..6bf1391 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_714.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_714.json
@@ -1,1 +1,1 @@
-{"name": "noibat", "types": ["dragon", "flying"], "stats": {"speed": 55, "special-defense": 40, "special-attack": 45, "defense": 35, "attack": 30, "hp": 40}}
\ No newline at end of file
+{"name": "noibat", "types": ["flying", "dragon"], "stats": {"hp": 40, "attack": 30, "defense": 35, "special-attack": 45, "special-defense": 40, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_715.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_715.json
index d5e517b..d33aa9c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_715.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_715.json
@@ -1,1 +1,1 @@
-{"name": "noivern", "types": ["dragon", "flying"], "stats": {"speed": 123, "special-defense": 80, "special-attack": 97, "defense": 80, "attack": 70, "hp": 85}}
\ No newline at end of file
+{"name": "noivern", "types": ["flying", "dragon"], "stats": {"hp": 85, "attack": 70, "defense": 80, "special-attack": 97, "special-defense": 80, "speed": 123}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_716.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_716.json
index e23c2da..2e1d42a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_716.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_716.json
@@ -1,1 +1,1 @@
-{"name": "xerneas", "types": ["fairy"], "stats": {"speed": 99, "special-defense": 98, "special-attack": 131, "defense": 95, "attack": 131, "hp": 126}}
\ No newline at end of file
+{"name": "xerneas", "types": ["fairy"], "stats": {"hp": 126, "attack": 131, "defense": 95, "special-attack": 131, "special-defense": 98, "speed": 99}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_717.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_717.json
index b92533d..8ea838d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_717.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_717.json
@@ -1,1 +1,1 @@
-{"name": "yveltal", "types": ["flying", "dark"], "stats": {"speed": 99, "special-defense": 98, "special-attack": 131, "defense": 95, "attack": 131, "hp": 126}}
\ No newline at end of file
+{"name": "yveltal", "types": ["dark", "flying"], "stats": {"hp": 126, "attack": 131, "defense": 95, "special-attack": 131, "special-defense": 98, "speed": 99}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_718.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_718.json
index d5e9033..f3ae0c5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_718.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_718.json
@@ -1,1 +1,1 @@
-{"name": "zygarde", "types": ["ground", "dragon"], "stats": {"speed": 95, "special-defense": 95, "special-attack": 81, "defense": 121, "attack": 100, "hp": 108}}
\ No newline at end of file
+{"name": "zygarde", "types": ["dragon", "ground"], "stats": {"hp": 108, "attack": 100, "defense": 121, "special-attack": 81, "special-defense": 95, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_719.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_719.json
index 171df20..4738794 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_719.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_719.json
@@ -1,1 +1,1 @@
-{"name": "diancie", "types": ["fairy", "rock"], "stats": {"speed": 50, "special-defense": 150, "special-attack": 100, "defense": 150, "attack": 100, "hp": 50}}
\ No newline at end of file
+{"name": "diancie", "types": ["rock", "fairy"], "stats": {"hp": 50, "attack": 100, "defense": 150, "special-attack": 100, "special-defense": 150, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_72.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_72.json
index 9f0d9a0..0e2db6a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_72.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_72.json
@@ -1,1 +1,1 @@
-{"name": "tentacool", "types": ["poison", "water"], "stats": {"speed": 70, "special-defense": 100, "special-attack": 50, "defense": 35, "attack": 40, "hp": 40}}
\ No newline at end of file
+{"name": "tentacool", "types": ["water", "poison"], "stats": {"hp": 40, "attack": 40, "defense": 35, "special-attack": 50, "special-defense": 100, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_720.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_720.json
index 6d554c8..2d136d6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_720.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_720.json
@@ -1,1 +1,1 @@
-{"name": "hoopa", "types": ["ghost", "psychic"], "stats": {"speed": 70, "special-defense": 130, "special-attack": 150, "defense": 60, "attack": 110, "hp": 80}}
\ No newline at end of file
+{"name": "hoopa", "types": ["psychic", "ghost"], "stats": {"hp": 80, "attack": 110, "defense": 60, "special-attack": 150, "special-defense": 130, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_721.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_721.json
index b3c64de..002d0d6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_721.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_721.json
@@ -1,1 +1,1 @@
-{"name": "volcanion", "types": ["water", "fire"], "stats": {"speed": 70, "special-defense": 90, "special-attack": 130, "defense": 120, "attack": 110, "hp": 80}}
\ No newline at end of file
+{"name": "volcanion", "types": ["fire", "water"], "stats": {"hp": 80, "attack": 110, "defense": 120, "special-attack": 130, "special-defense": 90, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_722.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_722.json
index 0291691..7c8b3b9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_722.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_722.json
@@ -1,1 +1,1 @@
-{"name": "rowlet", "types": ["flying", "grass"], "stats": {"speed": 42, "special-defense": 50, "special-attack": 50, "defense": 55, "attack": 55, "hp": 68}}
\ No newline at end of file
+{"name": "rowlet", "types": ["grass", "flying"], "stats": {"hp": 68, "attack": 55, "defense": 55, "special-attack": 50, "special-defense": 50, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_723.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_723.json
index 7d62c89..337278c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_723.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_723.json
@@ -1,1 +1,1 @@
-{"name": "dartrix", "types": ["flying", "grass"], "stats": {"speed": 52, "special-defense": 70, "special-attack": 70, "defense": 75, "attack": 75, "hp": 78}}
\ No newline at end of file
+{"name": "dartrix", "types": ["grass", "flying"], "stats": {"hp": 78, "attack": 75, "defense": 75, "special-attack": 70, "special-defense": 70, "speed": 52}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_724.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_724.json
index b2751b2..56b0fe6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_724.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_724.json
@@ -1,1 +1,1 @@
-{"name": "decidueye", "types": ["ghost", "grass"], "stats": {"speed": 70, "special-defense": 100, "special-attack": 100, "defense": 75, "attack": 107, "hp": 78}}
\ No newline at end of file
+{"name": "decidueye", "types": ["grass", "ghost"], "stats": {"hp": 78, "attack": 107, "defense": 75, "special-attack": 100, "special-defense": 100, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_725.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_725.json
index 550fcf7..4474896 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_725.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_725.json
@@ -1,1 +1,1 @@
-{"name": "litten", "types": ["fire"], "stats": {"speed": 70, "special-defense": 40, "special-attack": 60, "defense": 40, "attack": 65, "hp": 45}}
\ No newline at end of file
+{"name": "litten", "types": ["fire"], "stats": {"hp": 45, "attack": 65, "defense": 40, "special-attack": 60, "special-defense": 40, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_726.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_726.json
index 2344bc9..e592de3 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_726.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_726.json
@@ -1,1 +1,1 @@
-{"name": "torracat", "types": ["fire"], "stats": {"speed": 90, "special-defense": 50, "special-attack": 80, "defense": 50, "attack": 85, "hp": 65}}
\ No newline at end of file
+{"name": "torracat", "types": ["fire"], "stats": {"hp": 65, "attack": 85, "defense": 50, "special-attack": 80, "special-defense": 50, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_727.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_727.json
index 67d0b0c..42bc475 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_727.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_727.json
@@ -1,1 +1,1 @@
-{"name": "incineroar", "types": ["dark", "fire"], "stats": {"speed": 60, "special-defense": 90, "special-attack": 80, "defense": 90, "attack": 115, "hp": 95}}
\ No newline at end of file
+{"name": "incineroar", "types": ["fire", "dark"], "stats": {"hp": 95, "attack": 115, "defense": 90, "special-attack": 80, "special-defense": 90, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_728.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_728.json
index ee9cf1f..2170e40 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_728.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_728.json
@@ -1,1 +1,1 @@
-{"name": "popplio", "types": ["water"], "stats": {"speed": 40, "special-defense": 56, "special-attack": 66, "defense": 54, "attack": 54, "hp": 50}}
\ No newline at end of file
+{"name": "popplio", "types": ["water"], "stats": {"hp": 50, "attack": 54, "defense": 54, "special-attack": 66, "special-defense": 56, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_729.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_729.json
index 5edbbb7..ddf7473 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_729.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_729.json
@@ -1,1 +1,1 @@
-{"name": "brionne", "types": ["water"], "stats": {"speed": 50, "special-defense": 81, "special-attack": 91, "defense": 69, "attack": 69, "hp": 60}}
\ No newline at end of file
+{"name": "brionne", "types": ["water"], "stats": {"hp": 60, "attack": 69, "defense": 69, "special-attack": 91, "special-defense": 81, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_73.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_73.json
index 2ae538f..2dcd8b4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_73.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_73.json
@@ -1,1 +1,1 @@
-{"name": "tentacruel", "types": ["poison", "water"], "stats": {"speed": 100, "special-defense": 120, "special-attack": 80, "defense": 65, "attack": 70, "hp": 80}}
\ No newline at end of file
+{"name": "tentacruel", "types": ["water", "poison"], "stats": {"hp": 80, "attack": 70, "defense": 65, "special-attack": 80, "special-defense": 120, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_730.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_730.json
index 6544e5c..9c708e2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_730.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_730.json
@@ -1,1 +1,1 @@
-{"name": "primarina", "types": ["fairy", "water"], "stats": {"speed": 60, "special-defense": 116, "special-attack": 126, "defense": 74, "attack": 74, "hp": 80}}
\ No newline at end of file
+{"name": "primarina", "types": ["water", "fairy"], "stats": {"hp": 80, "attack": 74, "defense": 74, "special-attack": 126, "special-defense": 116, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_731.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_731.json
index b753648..24d7629 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_731.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_731.json
@@ -1,1 +1,1 @@
-{"name": "pikipek", "types": ["flying", "normal"], "stats": {"speed": 65, "special-defense": 30, "special-attack": 30, "defense": 30, "attack": 75, "hp": 35}}
\ No newline at end of file
+{"name": "pikipek", "types": ["normal", "flying"], "stats": {"hp": 35, "attack": 75, "defense": 30, "special-attack": 30, "special-defense": 30, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_732.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_732.json
index a537389..8ba57b7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_732.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_732.json
@@ -1,1 +1,1 @@
-{"name": "trumbeak", "types": ["flying", "normal"], "stats": {"speed": 75, "special-defense": 50, "special-attack": 40, "defense": 50, "attack": 85, "hp": 55}}
\ No newline at end of file
+{"name": "trumbeak", "types": ["normal", "flying"], "stats": {"hp": 55, "attack": 85, "defense": 50, "special-attack": 40, "special-defense": 50, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_733.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_733.json
index 71419c1..ce615fc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_733.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_733.json
@@ -1,1 +1,1 @@
-{"name": "toucannon", "types": ["flying", "normal"], "stats": {"speed": 60, "special-defense": 75, "special-attack": 75, "defense": 75, "attack": 120, "hp": 80}}
\ No newline at end of file
+{"name": "toucannon", "types": ["normal", "flying"], "stats": {"hp": 80, "attack": 120, "defense": 75, "special-attack": 75, "special-defense": 75, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_734.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_734.json
index d7709ca..c98bd2e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_734.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_734.json
@@ -1,1 +1,1 @@
-{"name": "yungoos", "types": ["normal"], "stats": {"speed": 45, "special-defense": 30, "special-attack": 30, "defense": 30, "attack": 70, "hp": 48}}
\ No newline at end of file
+{"name": "yungoos", "types": ["normal"], "stats": {"hp": 48, "attack": 70, "defense": 30, "special-attack": 30, "special-defense": 30, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_735.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_735.json
index a528bee..ba450f5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_735.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_735.json
@@ -1,1 +1,1 @@
-{"name": "gumshoos", "types": ["normal"], "stats": {"speed": 45, "special-defense": 60, "special-attack": 55, "defense": 60, "attack": 110, "hp": 88}}
\ No newline at end of file
+{"name": "gumshoos", "types": ["normal"], "stats": {"hp": 88, "attack": 110, "defense": 60, "special-attack": 55, "special-defense": 60, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_736.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_736.json
index 6b68068..f664158 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_736.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_736.json
@@ -1,1 +1,1 @@
-{"name": "grubbin", "types": ["bug"], "stats": {"speed": 46, "special-defense": 45, "special-attack": 55, "defense": 45, "attack": 62, "hp": 47}}
\ No newline at end of file
+{"name": "grubbin", "types": ["bug"], "stats": {"hp": 47, "attack": 62, "defense": 45, "special-attack": 55, "special-defense": 45, "speed": 46}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_737.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_737.json
index a468377..8e45781 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_737.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_737.json
@@ -1,1 +1,1 @@
-{"name": "charjabug", "types": ["electric", "bug"], "stats": {"speed": 36, "special-defense": 75, "special-attack": 55, "defense": 95, "attack": 82, "hp": 57}}
\ No newline at end of file
+{"name": "charjabug", "types": ["bug", "electric"], "stats": {"hp": 57, "attack": 82, "defense": 95, "special-attack": 55, "special-defense": 75, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_738.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_738.json
index 7418de8..b9b57f6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_738.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_738.json
@@ -1,1 +1,1 @@
-{"name": "vikavolt", "types": ["electric", "bug"], "stats": {"speed": 43, "special-defense": 75, "special-attack": 145, "defense": 90, "attack": 70, "hp": 77}}
\ No newline at end of file
+{"name": "vikavolt", "types": ["bug", "electric"], "stats": {"hp": 77, "attack": 70, "defense": 90, "special-attack": 145, "special-defense": 75, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_739.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_739.json
index 762539a..132a141 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_739.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_739.json
@@ -1,1 +1,1 @@
-{"name": "crabrawler", "types": ["fighting"], "stats": {"speed": 63, "special-defense": 47, "special-attack": 42, "defense": 57, "attack": 82, "hp": 47}}
\ No newline at end of file
+{"name": "crabrawler", "types": ["fighting"], "stats": {"hp": 47, "attack": 82, "defense": 57, "special-attack": 42, "special-defense": 47, "speed": 63}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_74.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_74.json
index 8be47c3..c920bcd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_74.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_74.json
@@ -1,1 +1,1 @@
-{"name": "geodude", "types": ["ground", "rock"], "stats": {"speed": 20, "special-defense": 30, "special-attack": 30, "defense": 100, "attack": 80, "hp": 40}}
\ No newline at end of file
+{"name": "geodude", "types": ["rock", "ground"], "stats": {"hp": 40, "attack": 80, "defense": 100, "special-attack": 30, "special-defense": 30, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_740.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_740.json
index 65ec9c2..dbb49fa 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_740.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_740.json
@@ -1,1 +1,1 @@
-{"name": "crabominable", "types": ["ice", "fighting"], "stats": {"speed": 43, "special-defense": 67, "special-attack": 62, "defense": 77, "attack": 132, "hp": 97}}
\ No newline at end of file
+{"name": "crabominable", "types": ["fighting", "ice"], "stats": {"hp": 97, "attack": 132, "defense": 77, "special-attack": 62, "special-defense": 67, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_741.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_741.json
index 413d97e..81b2dba 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_741.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_741.json
@@ -1,1 +1,1 @@
-{"name": "oricorio-baile", "types": ["flying", "fire"], "stats": {"speed": 93, "special-defense": 70, "special-attack": 98, "defense": 70, "attack": 70, "hp": 75}}
\ No newline at end of file
+{"name": "oricorio-baile", "types": ["fire", "flying"], "stats": {"hp": 75, "attack": 70, "defense": 70, "special-attack": 98, "special-defense": 70, "speed": 93}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_742.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_742.json
index a16523f..4bb8ff7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_742.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_742.json
@@ -1,1 +1,1 @@
-{"name": "cutiefly", "types": ["fairy", "bug"], "stats": {"speed": 84, "special-defense": 40, "special-attack": 55, "defense": 40, "attack": 45, "hp": 40}}
\ No newline at end of file
+{"name": "cutiefly", "types": ["bug", "fairy"], "stats": {"hp": 40, "attack": 45, "defense": 40, "special-attack": 55, "special-defense": 40, "speed": 84}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_743.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_743.json
index 8b4df49..482482d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_743.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_743.json
@@ -1,1 +1,1 @@
-{"name": "ribombee", "types": ["fairy", "bug"], "stats": {"speed": 124, "special-defense": 70, "special-attack": 95, "defense": 60, "attack": 55, "hp": 60}}
\ No newline at end of file
+{"name": "ribombee", "types": ["bug", "fairy"], "stats": {"hp": 60, "attack": 55, "defense": 60, "special-attack": 95, "special-defense": 70, "speed": 124}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_744.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_744.json
index 5a745dc..d842e97 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_744.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_744.json
@@ -1,1 +1,1 @@
-{"name": "rockruff", "types": ["rock"], "stats": {"speed": 60, "special-defense": 40, "special-attack": 30, "defense": 40, "attack": 65, "hp": 45}}
\ No newline at end of file
+{"name": "rockruff", "types": ["rock"], "stats": {"hp": 45, "attack": 65, "defense": 40, "special-attack": 30, "special-defense": 40, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_745.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_745.json
index e448fd6..6162077 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_745.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_745.json
@@ -1,1 +1,1 @@
-{"name": "lycanroc-midday", "types": ["rock"], "stats": {"speed": 112, "special-defense": 65, "special-attack": 55, "defense": 65, "attack": 115, "hp": 75}}
\ No newline at end of file
+{"name": "lycanroc-midday", "types": ["rock"], "stats": {"hp": 75, "attack": 115, "defense": 65, "special-attack": 55, "special-defense": 65, "speed": 112}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_746.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_746.json
index fa69b30..6800d79 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_746.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_746.json
@@ -1,1 +1,1 @@
-{"name": "wishiwashi-solo", "types": ["water"], "stats": {"speed": 40, "special-defense": 25, "special-attack": 25, "defense": 20, "attack": 20, "hp": 45}}
\ No newline at end of file
+{"name": "wishiwashi-solo", "types": ["water"], "stats": {"hp": 45, "attack": 20, "defense": 20, "special-attack": 25, "special-defense": 25, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_747.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_747.json
index d2cc717..0b9958c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_747.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_747.json
@@ -1,1 +1,1 @@
-{"name": "mareanie", "types": ["water", "poison"], "stats": {"speed": 45, "special-defense": 52, "special-attack": 43, "defense": 62, "attack": 53, "hp": 50}}
\ No newline at end of file
+{"name": "mareanie", "types": ["poison", "water"], "stats": {"hp": 50, "attack": 53, "defense": 62, "special-attack": 43, "special-defense": 52, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_748.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_748.json
index 5dbc476..dcfd10a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_748.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_748.json
@@ -1,1 +1,1 @@
-{"name": "toxapex", "types": ["water", "poison"], "stats": {"speed": 35, "special-defense": 142, "special-attack": 53, "defense": 152, "attack": 63, "hp": 50}}
\ No newline at end of file
+{"name": "toxapex", "types": ["poison", "water"], "stats": {"hp": 50, "attack": 63, "defense": 152, "special-attack": 53, "special-defense": 142, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_749.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_749.json
index abdf1f8..cbdea6c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_749.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_749.json
@@ -1,1 +1,1 @@
-{"name": "mudbray", "types": ["ground"], "stats": {"speed": 45, "special-defense": 55, "special-attack": 45, "defense": 70, "attack": 100, "hp": 70}}
\ No newline at end of file
+{"name": "mudbray", "types": ["ground"], "stats": {"hp": 70, "attack": 100, "defense": 70, "special-attack": 45, "special-defense": 55, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_75.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_75.json
index 5ad8fd3..a6fbb18 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_75.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_75.json
@@ -1,1 +1,1 @@
-{"name": "graveler", "types": ["ground", "rock"], "stats": {"speed": 35, "special-defense": 45, "special-attack": 45, "defense": 115, "attack": 95, "hp": 55}}
\ No newline at end of file
+{"name": "graveler", "types": ["rock", "ground"], "stats": {"hp": 55, "attack": 95, "defense": 115, "special-attack": 45, "special-defense": 45, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_750.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_750.json
index e4ef1d7..341d157 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_750.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_750.json
@@ -1,1 +1,1 @@
-{"name": "mudsdale", "types": ["ground"], "stats": {"speed": 35, "special-defense": 85, "special-attack": 55, "defense": 100, "attack": 125, "hp": 100}}
\ No newline at end of file
+{"name": "mudsdale", "types": ["ground"], "stats": {"hp": 100, "attack": 125, "defense": 100, "special-attack": 55, "special-defense": 85, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_751.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_751.json
index 03ffe3f..9d5f684 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_751.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_751.json
@@ -1,1 +1,1 @@
-{"name": "dewpider", "types": ["bug", "water"], "stats": {"speed": 27, "special-defense": 72, "special-attack": 40, "defense": 52, "attack": 40, "hp": 38}}
\ No newline at end of file
+{"name": "dewpider", "types": ["water", "bug"], "stats": {"hp": 38, "attack": 40, "defense": 52, "special-attack": 40, "special-defense": 72, "speed": 27}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_752.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_752.json
index 705d1c3..ff1b206 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_752.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_752.json
@@ -1,1 +1,1 @@
-{"name": "araquanid", "types": ["bug", "water"], "stats": {"speed": 42, "special-defense": 132, "special-attack": 50, "defense": 92, "attack": 70, "hp": 68}}
\ No newline at end of file
+{"name": "araquanid", "types": ["water", "bug"], "stats": {"hp": 68, "attack": 70, "defense": 92, "special-attack": 50, "special-defense": 132, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_753.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_753.json
index 8ca0765..bb7264b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_753.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_753.json
@@ -1,1 +1,1 @@
-{"name": "fomantis", "types": ["grass"], "stats": {"speed": 35, "special-defense": 35, "special-attack": 50, "defense": 35, "attack": 55, "hp": 40}}
\ No newline at end of file
+{"name": "fomantis", "types": ["grass"], "stats": {"hp": 40, "attack": 55, "defense": 35, "special-attack": 50, "special-defense": 35, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_754.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_754.json
index c60e3bb..b3fdd55 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_754.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_754.json
@@ -1,1 +1,1 @@
-{"name": "lurantis", "types": ["grass"], "stats": {"speed": 45, "special-defense": 90, "special-attack": 80, "defense": 90, "attack": 105, "hp": 70}}
\ No newline at end of file
+{"name": "lurantis", "types": ["grass"], "stats": {"hp": 70, "attack": 105, "defense": 90, "special-attack": 80, "special-defense": 90, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_755.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_755.json
index d1c4c76..248ffd8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_755.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_755.json
@@ -1,1 +1,1 @@
-{"name": "morelull", "types": ["fairy", "grass"], "stats": {"speed": 15, "special-defense": 75, "special-attack": 65, "defense": 55, "attack": 35, "hp": 40}}
\ No newline at end of file
+{"name": "morelull", "types": ["grass", "fairy"], "stats": {"hp": 40, "attack": 35, "defense": 55, "special-attack": 65, "special-defense": 75, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_756.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_756.json
index d1644c9..c02f2d8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_756.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_756.json
@@ -1,1 +1,1 @@
-{"name": "shiinotic", "types": ["fairy", "grass"], "stats": {"speed": 30, "special-defense": 100, "special-attack": 90, "defense": 80, "attack": 45, "hp": 60}}
\ No newline at end of file
+{"name": "shiinotic", "types": ["grass", "fairy"], "stats": {"hp": 60, "attack": 45, "defense": 80, "special-attack": 90, "special-defense": 100, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_757.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_757.json
index 8199f05..1f03389 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_757.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_757.json
@@ -1,1 +1,1 @@
-{"name": "salandit", "types": ["fire", "poison"], "stats": {"speed": 77, "special-defense": 40, "special-attack": 71, "defense": 40, "attack": 44, "hp": 48}}
\ No newline at end of file
+{"name": "salandit", "types": ["poison", "fire"], "stats": {"hp": 48, "attack": 44, "defense": 40, "special-attack": 71, "special-defense": 40, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_758.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_758.json
index 36e388a..e61ef63 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_758.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_758.json
@@ -1,1 +1,1 @@
-{"name": "salazzle", "types": ["fire", "poison"], "stats": {"speed": 117, "special-defense": 60, "special-attack": 111, "defense": 60, "attack": 64, "hp": 68}}
\ No newline at end of file
+{"name": "salazzle", "types": ["poison", "fire"], "stats": {"hp": 68, "attack": 64, "defense": 60, "special-attack": 111, "special-defense": 60, "speed": 117}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_759.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_759.json
index e32ad1a..69587bc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_759.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_759.json
@@ -1,1 +1,1 @@
-{"name": "stufful", "types": ["fighting", "normal"], "stats": {"speed": 50, "special-defense": 50, "special-attack": 45, "defense": 50, "attack": 75, "hp": 70}}
\ No newline at end of file
+{"name": "stufful", "types": ["normal", "fighting"], "stats": {"hp": 70, "attack": 75, "defense": 50, "special-attack": 45, "special-defense": 50, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_76.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_76.json
index 609f564..f93b143 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_76.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_76.json
@@ -1,1 +1,1 @@
-{"name": "golem", "types": ["ground", "rock"], "stats": {"speed": 45, "special-defense": 65, "special-attack": 55, "defense": 130, "attack": 120, "hp": 80}}
\ No newline at end of file
+{"name": "golem", "types": ["rock", "ground"], "stats": {"hp": 80, "attack": 120, "defense": 130, "special-attack": 55, "special-defense": 65, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_760.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_760.json
index 417f70f..78ad41e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_760.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_760.json
@@ -1,1 +1,1 @@
-{"name": "bewear", "types": ["fighting", "normal"], "stats": {"speed": 60, "special-defense": 60, "special-attack": 55, "defense": 80, "attack": 125, "hp": 120}}
\ No newline at end of file
+{"name": "bewear", "types": ["normal", "fighting"], "stats": {"hp": 120, "attack": 125, "defense": 80, "special-attack": 55, "special-defense": 60, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_761.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_761.json
index 46c8d92..8167787 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_761.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_761.json
@@ -1,1 +1,1 @@
-{"name": "bounsweet", "types": ["grass"], "stats": {"speed": 32, "special-defense": 38, "special-attack": 30, "defense": 38, "attack": 30, "hp": 42}}
\ No newline at end of file
+{"name": "bounsweet", "types": ["grass"], "stats": {"hp": 42, "attack": 30, "defense": 38, "special-attack": 30, "special-defense": 38, "speed": 32}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_762.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_762.json
index 3ab2a98..3b94805 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_762.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_762.json
@@ -1,1 +1,1 @@
-{"name": "steenee", "types": ["grass"], "stats": {"speed": 62, "special-defense": 48, "special-attack": 40, "defense": 48, "attack": 40, "hp": 52}}
\ No newline at end of file
+{"name": "steenee", "types": ["grass"], "stats": {"hp": 52, "attack": 40, "defense": 48, "special-attack": 40, "special-defense": 48, "speed": 62}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_763.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_763.json
index bfb9c2b..a290092 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_763.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_763.json
@@ -1,1 +1,1 @@
-{"name": "tsareena", "types": ["grass"], "stats": {"speed": 72, "special-defense": 98, "special-attack": 50, "defense": 98, "attack": 120, "hp": 72}}
\ No newline at end of file
+{"name": "tsareena", "types": ["grass"], "stats": {"hp": 72, "attack": 120, "defense": 98, "special-attack": 50, "special-defense": 98, "speed": 72}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_764.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_764.json
index ceeeaff..dbc4ffd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_764.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_764.json
@@ -1,1 +1,1 @@
-{"name": "comfey", "types": ["fairy"], "stats": {"speed": 100, "special-defense": 110, "special-attack": 82, "defense": 90, "attack": 52, "hp": 51}}
\ No newline at end of file
+{"name": "comfey", "types": ["fairy"], "stats": {"hp": 51, "attack": 52, "defense": 90, "special-attack": 82, "special-defense": 110, "speed": 100}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_765.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_765.json
index c8612c6..98fbfa6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_765.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_765.json
@@ -1,1 +1,1 @@
-{"name": "oranguru", "types": ["psychic", "normal"], "stats": {"speed": 60, "special-defense": 110, "special-attack": 90, "defense": 80, "attack": 60, "hp": 90}}
\ No newline at end of file
+{"name": "oranguru", "types": ["normal", "psychic"], "stats": {"hp": 90, "attack": 60, "defense": 80, "special-attack": 90, "special-defense": 110, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_766.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_766.json
index f1110ae..63357df 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_766.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_766.json
@@ -1,1 +1,1 @@
-{"name": "passimian", "types": ["fighting"], "stats": {"speed": 80, "special-defense": 60, "special-attack": 40, "defense": 90, "attack": 120, "hp": 100}}
\ No newline at end of file
+{"name": "passimian", "types": ["fighting"], "stats": {"hp": 100, "attack": 120, "defense": 90, "special-attack": 40, "special-defense": 60, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_767.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_767.json
index 5b6407b..407396d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_767.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_767.json
@@ -1,1 +1,1 @@
-{"name": "wimpod", "types": ["water", "bug"], "stats": {"speed": 80, "special-defense": 30, "special-attack": 20, "defense": 40, "attack": 35, "hp": 25}}
\ No newline at end of file
+{"name": "wimpod", "types": ["bug", "water"], "stats": {"hp": 25, "attack": 35, "defense": 40, "special-attack": 20, "special-defense": 30, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_768.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_768.json
index fe39dd3..2f96d8f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_768.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_768.json
@@ -1,1 +1,1 @@
-{"name": "golisopod", "types": ["water", "bug"], "stats": {"speed": 40, "special-defense": 90, "special-attack": 60, "defense": 140, "attack": 125, "hp": 75}}
\ No newline at end of file
+{"name": "golisopod", "types": ["bug", "water"], "stats": {"hp": 75, "attack": 125, "defense": 140, "special-attack": 60, "special-defense": 90, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_769.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_769.json
index f2bf69f..52bde06 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_769.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_769.json
@@ -1,1 +1,1 @@
-{"name": "sandygast", "types": ["ground", "ghost"], "stats": {"speed": 15, "special-defense": 45, "special-attack": 70, "defense": 80, "attack": 55, "hp": 55}}
\ No newline at end of file
+{"name": "sandygast", "types": ["ghost", "ground"], "stats": {"hp": 55, "attack": 55, "defense": 80, "special-attack": 70, "special-defense": 45, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_77.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_77.json
index c177bf3..fa3d5d4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_77.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_77.json
@@ -1,1 +1,1 @@
-{"name": "ponyta", "types": ["fire"], "stats": {"speed": 90, "special-defense": 65, "special-attack": 65, "defense": 55, "attack": 85, "hp": 50}}
\ No newline at end of file
+{"name": "ponyta", "types": ["fire"], "stats": {"hp": 50, "attack": 85, "defense": 55, "special-attack": 65, "special-defense": 65, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_770.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_770.json
index f7f1718..355e70d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_770.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_770.json
@@ -1,1 +1,1 @@
-{"name": "palossand", "types": ["ground", "ghost"], "stats": {"speed": 35, "special-defense": 75, "special-attack": 100, "defense": 110, "attack": 75, "hp": 85}}
\ No newline at end of file
+{"name": "palossand", "types": ["ghost", "ground"], "stats": {"hp": 85, "attack": 75, "defense": 110, "special-attack": 100, "special-defense": 75, "speed": 35}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_771.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_771.json
index 00f1f9b..0d0523e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_771.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_771.json
@@ -1,1 +1,1 @@
-{"name": "pyukumuku", "types": ["water"], "stats": {"speed": 5, "special-defense": 130, "special-attack": 30, "defense": 130, "attack": 60, "hp": 55}}
\ No newline at end of file
+{"name": "pyukumuku", "types": ["water"], "stats": {"hp": 55, "attack": 60, "defense": 130, "special-attack": 30, "special-defense": 130, "speed": 5}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_772.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_772.json
index b4c6f4a..1e518b4 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_772.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_772.json
@@ -1,1 +1,1 @@
-{"name": "type-null", "types": ["normal"], "stats": {"speed": 59, "special-defense": 95, "special-attack": 95, "defense": 95, "attack": 95, "hp": 95}}
\ No newline at end of file
+{"name": "type-null", "types": ["normal"], "stats": {"hp": 95, "attack": 95, "defense": 95, "special-attack": 95, "special-defense": 95, "speed": 59}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_773.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_773.json
index 10cebca..6342ca6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_773.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_773.json
@@ -1,1 +1,1 @@
-{"name": "silvally", "types": ["normal"], "stats": {"speed": 95, "special-defense": 95, "special-attack": 95, "defense": 95, "attack": 95, "hp": 95}}
\ No newline at end of file
+{"name": "silvally", "types": ["normal"], "stats": {"hp": 95, "attack": 95, "defense": 95, "special-attack": 95, "special-defense": 95, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_774.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_774.json
index 8f04612..a6aa640 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_774.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_774.json
@@ -1,1 +1,1 @@
-{"name": "minior-red-meteor", "types": ["flying", "rock"], "stats": {"speed": 60, "special-defense": 100, "special-attack": 60, "defense": 100, "attack": 60, "hp": 60}}
\ No newline at end of file
+{"name": "minior-red-meteor", "types": ["rock", "flying"], "stats": {"hp": 60, "attack": 60, "defense": 100, "special-attack": 60, "special-defense": 100, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_775.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_775.json
index 0afbb6f..ea979ec 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_775.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_775.json
@@ -1,1 +1,1 @@
-{"name": "komala", "types": ["normal"], "stats": {"speed": 65, "special-defense": 95, "special-attack": 75, "defense": 65, "attack": 115, "hp": 65}}
\ No newline at end of file
+{"name": "komala", "types": ["normal"], "stats": {"hp": 65, "attack": 115, "defense": 65, "special-attack": 75, "special-defense": 95, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_776.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_776.json
index cb075e6..117d815 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_776.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_776.json
@@ -1,1 +1,1 @@
-{"name": "turtonator", "types": ["dragon", "fire"], "stats": {"speed": 36, "special-defense": 85, "special-attack": 91, "defense": 135, "attack": 78, "hp": 60}}
\ No newline at end of file
+{"name": "turtonator", "types": ["fire", "dragon"], "stats": {"hp": 60, "attack": 78, "defense": 135, "special-attack": 91, "special-defense": 85, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_777.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_777.json
index c689d64..5000525 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_777.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_777.json
@@ -1,1 +1,1 @@
-{"name": "togedemaru", "types": ["steel", "electric"], "stats": {"speed": 96, "special-defense": 73, "special-attack": 40, "defense": 63, "attack": 98, "hp": 65}}
\ No newline at end of file
+{"name": "togedemaru", "types": ["electric", "steel"], "stats": {"hp": 65, "attack": 98, "defense": 63, "special-attack": 40, "special-defense": 73, "speed": 96}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_778.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_778.json
index 6b3fe1d..a07f5dd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_778.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_778.json
@@ -1,1 +1,1 @@
-{"name": "mimikyu-disguised", "types": ["fairy", "ghost"], "stats": {"speed": 96, "special-defense": 105, "special-attack": 50, "defense": 80, "attack": 90, "hp": 55}}
\ No newline at end of file
+{"name": "mimikyu-disguised", "types": ["ghost", "fairy"], "stats": {"hp": 55, "attack": 90, "defense": 80, "special-attack": 50, "special-defense": 105, "speed": 96}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_779.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_779.json
index 6c133e6..bb5593c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_779.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_779.json
@@ -1,1 +1,1 @@
-{"name": "bruxish", "types": ["psychic", "water"], "stats": {"speed": 92, "special-defense": 70, "special-attack": 70, "defense": 70, "attack": 105, "hp": 68}}
\ No newline at end of file
+{"name": "bruxish", "types": ["water", "psychic"], "stats": {"hp": 68, "attack": 105, "defense": 70, "special-attack": 70, "special-defense": 70, "speed": 92}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_78.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_78.json
index fb7df9f..7483a37 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_78.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_78.json
@@ -1,1 +1,1 @@
-{"name": "rapidash", "types": ["fire"], "stats": {"speed": 105, "special-defense": 80, "special-attack": 80, "defense": 70, "attack": 100, "hp": 65}}
\ No newline at end of file
+{"name": "rapidash", "types": ["fire"], "stats": {"hp": 65, "attack": 100, "defense": 70, "special-attack": 80, "special-defense": 80, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_780.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_780.json
index 401565d..201c00f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_780.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_780.json
@@ -1,1 +1,1 @@
-{"name": "drampa", "types": ["dragon", "normal"], "stats": {"speed": 36, "special-defense": 91, "special-attack": 135, "defense": 85, "attack": 60, "hp": 78}}
\ No newline at end of file
+{"name": "drampa", "types": ["normal", "dragon"], "stats": {"hp": 78, "attack": 60, "defense": 85, "special-attack": 135, "special-defense": 91, "speed": 36}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_781.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_781.json
index 55ceba6..3785538 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_781.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_781.json
@@ -1,1 +1,1 @@
-{"name": "dhelmise", "types": ["grass", "ghost"], "stats": {"speed": 40, "special-defense": 90, "special-attack": 86, "defense": 100, "attack": 131, "hp": 70}}
\ No newline at end of file
+{"name": "dhelmise", "types": ["ghost", "grass"], "stats": {"hp": 70, "attack": 131, "defense": 100, "special-attack": 86, "special-defense": 90, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_782.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_782.json
index bc6529a..9c7c4ec 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_782.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_782.json
@@ -1,1 +1,1 @@
-{"name": "jangmo-o", "types": ["dragon"], "stats": {"speed": 45, "special-defense": 45, "special-attack": 45, "defense": 65, "attack": 55, "hp": 45}}
\ No newline at end of file
+{"name": "jangmo-o", "types": ["dragon"], "stats": {"hp": 45, "attack": 55, "defense": 65, "special-attack": 45, "special-defense": 45, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_783.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_783.json
index 1ee57dd..e81a42c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_783.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_783.json
@@ -1,1 +1,1 @@
-{"name": "hakamo-o", "types": ["fighting", "dragon"], "stats": {"speed": 65, "special-defense": 70, "special-attack": 65, "defense": 90, "attack": 75, "hp": 55}}
\ No newline at end of file
+{"name": "hakamo-o", "types": ["dragon", "fighting"], "stats": {"hp": 55, "attack": 75, "defense": 90, "special-attack": 65, "special-defense": 70, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_784.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_784.json
index a50ad64..7241a24 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_784.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_784.json
@@ -1,1 +1,1 @@
-{"name": "kommo-o", "types": ["fighting", "dragon"], "stats": {"speed": 85, "special-defense": 105, "special-attack": 100, "defense": 125, "attack": 110, "hp": 75}}
\ No newline at end of file
+{"name": "kommo-o", "types": ["dragon", "fighting"], "stats": {"hp": 75, "attack": 110, "defense": 125, "special-attack": 100, "special-defense": 105, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_785.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_785.json
index c69ff6f..ccc23f2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_785.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_785.json
@@ -1,1 +1,1 @@
-{"name": "tapu-koko", "types": ["fairy", "electric"], "stats": {"speed": 130, "special-defense": 75, "special-attack": 95, "defense": 85, "attack": 115, "hp": 70}}
\ No newline at end of file
+{"name": "tapu-koko", "types": ["electric", "fairy"], "stats": {"hp": 70, "attack": 115, "defense": 85, "special-attack": 95, "special-defense": 75, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_786.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_786.json
index bf83027..8d939cc 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_786.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_786.json
@@ -1,1 +1,1 @@
-{"name": "tapu-lele", "types": ["fairy", "psychic"], "stats": {"speed": 95, "special-defense": 115, "special-attack": 130, "defense": 75, "attack": 85, "hp": 70}}
\ No newline at end of file
+{"name": "tapu-lele", "types": ["psychic", "fairy"], "stats": {"hp": 70, "attack": 85, "defense": 75, "special-attack": 130, "special-defense": 115, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_787.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_787.json
index 194ad0c..cb24f0a 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_787.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_787.json
@@ -1,1 +1,1 @@
-{"name": "tapu-bulu", "types": ["fairy", "grass"], "stats": {"speed": 75, "special-defense": 95, "special-attack": 85, "defense": 115, "attack": 130, "hp": 70}}
\ No newline at end of file
+{"name": "tapu-bulu", "types": ["grass", "fairy"], "stats": {"hp": 70, "attack": 130, "defense": 115, "special-attack": 85, "special-defense": 95, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_788.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_788.json
index 4d09720..df00cb9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_788.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_788.json
@@ -1,1 +1,1 @@
-{"name": "tapu-fini", "types": ["fairy", "water"], "stats": {"speed": 85, "special-defense": 130, "special-attack": 95, "defense": 115, "attack": 75, "hp": 70}}
\ No newline at end of file
+{"name": "tapu-fini", "types": ["water", "fairy"], "stats": {"hp": 70, "attack": 75, "defense": 115, "special-attack": 95, "special-defense": 130, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_789.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_789.json
index 0e59c1c..65d215e 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_789.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_789.json
@@ -1,1 +1,1 @@
-{"name": "cosmog", "types": ["psychic"], "stats": {"speed": 37, "special-defense": 31, "special-attack": 29, "defense": 31, "attack": 29, "hp": 43}}
\ No newline at end of file
+{"name": "cosmog", "types": ["psychic"], "stats": {"hp": 43, "attack": 29, "defense": 31, "special-attack": 29, "special-defense": 31, "speed": 37}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_79.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_79.json
index 219c403..46fd55c 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_79.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_79.json
@@ -1,1 +1,1 @@
-{"name": "slowpoke", "types": ["psychic", "water"], "stats": {"speed": 15, "special-defense": 40, "special-attack": 40, "defense": 65, "attack": 65, "hp": 90}}
\ No newline at end of file
+{"name": "slowpoke", "types": ["water", "psychic"], "stats": {"hp": 90, "attack": 65, "defense": 65, "special-attack": 40, "special-defense": 40, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_790.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_790.json
index c36a78d..ac99d30 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_790.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_790.json
@@ -1,1 +1,1 @@
-{"name": "cosmoem", "types": ["psychic"], "stats": {"speed": 37, "special-defense": 131, "special-attack": 29, "defense": 131, "attack": 29, "hp": 43}}
\ No newline at end of file
+{"name": "cosmoem", "types": ["psychic"], "stats": {"hp": 43, "attack": 29, "defense": 131, "special-attack": 29, "special-defense": 131, "speed": 37}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_791.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_791.json
index 51f883e..03537cf 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_791.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_791.json
@@ -1,1 +1,1 @@
-{"name": "solgaleo", "types": ["steel", "psychic"], "stats": {"speed": 97, "special-defense": 89, "special-attack": 113, "defense": 107, "attack": 137, "hp": 137}}
\ No newline at end of file
+{"name": "solgaleo", "types": ["psychic", "steel"], "stats": {"hp": 137, "attack": 137, "defense": 107, "special-attack": 113, "special-defense": 89, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_792.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_792.json
index fc8791a..3faa1ea 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_792.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_792.json
@@ -1,1 +1,1 @@
-{"name": "lunala", "types": ["ghost", "psychic"], "stats": {"speed": 97, "special-defense": 107, "special-attack": 137, "defense": 89, "attack": 113, "hp": 137}}
\ No newline at end of file
+{"name": "lunala", "types": ["psychic", "ghost"], "stats": {"hp": 137, "attack": 113, "defense": 89, "special-attack": 137, "special-defense": 107, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_793.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_793.json
index 736bda7..4434504 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_793.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_793.json
@@ -1,1 +1,1 @@
-{"name": "nihilego", "types": ["poison", "rock"], "stats": {"speed": 103, "special-defense": 131, "special-attack": 127, "defense": 47, "attack": 53, "hp": 109}}
\ No newline at end of file
+{"name": "nihilego", "types": ["rock", "poison"], "stats": {"hp": 109, "attack": 53, "defense": 47, "special-attack": 127, "special-defense": 131, "speed": 103}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_794.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_794.json
index 445653a..2606374 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_794.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_794.json
@@ -1,1 +1,1 @@
-{"name": "buzzwole", "types": ["fighting", "bug"], "stats": {"speed": 79, "special-defense": 53, "special-attack": 53, "defense": 139, "attack": 139, "hp": 107}}
\ No newline at end of file
+{"name": "buzzwole", "types": ["bug", "fighting"], "stats": {"hp": 107, "attack": 139, "defense": 139, "special-attack": 53, "special-defense": 53, "speed": 79}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_795.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_795.json
index f9640ba..f64f1a5 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_795.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_795.json
@@ -1,1 +1,1 @@
-{"name": "pheromosa", "types": ["fighting", "bug"], "stats": {"speed": 151, "special-defense": 37, "special-attack": 137, "defense": 37, "attack": 137, "hp": 71}}
\ No newline at end of file
+{"name": "pheromosa", "types": ["bug", "fighting"], "stats": {"hp": 71, "attack": 137, "defense": 37, "special-attack": 137, "special-defense": 37, "speed": 151}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_796.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_796.json
index 6b0fb98..86b4238 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_796.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_796.json
@@ -1,1 +1,1 @@
-{"name": "xurkitree", "types": ["electric"], "stats": {"speed": 83, "special-defense": 71, "special-attack": 173, "defense": 71, "attack": 89, "hp": 83}}
\ No newline at end of file
+{"name": "xurkitree", "types": ["electric"], "stats": {"hp": 83, "attack": 89, "defense": 71, "special-attack": 173, "special-defense": 71, "speed": 83}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_797.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_797.json
index ff7cbf8..7a06687 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_797.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_797.json
@@ -1,1 +1,1 @@
-{"name": "celesteela", "types": ["flying", "steel"], "stats": {"speed": 61, "special-defense": 101, "special-attack": 107, "defense": 103, "attack": 101, "hp": 97}}
\ No newline at end of file
+{"name": "celesteela", "types": ["steel", "flying"], "stats": {"hp": 97, "attack": 101, "defense": 103, "special-attack": 107, "special-defense": 101, "speed": 61}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_798.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_798.json
index 9d80266..896faec 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_798.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_798.json
@@ -1,1 +1,1 @@
-{"name": "kartana", "types": ["steel", "grass"], "stats": {"speed": 109, "special-defense": 31, "special-attack": 59, "defense": 131, "attack": 181, "hp": 59}}
\ No newline at end of file
+{"name": "kartana", "types": ["grass", "steel"], "stats": {"hp": 59, "attack": 181, "defense": 131, "special-attack": 59, "special-defense": 31, "speed": 109}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_799.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_799.json
index 578f967..3f05315 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_799.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_799.json
@@ -1,1 +1,1 @@
-{"name": "guzzlord", "types": ["dragon", "dark"], "stats": {"speed": 43, "special-defense": 53, "special-attack": 97, "defense": 53, "attack": 101, "hp": 223}}
\ No newline at end of file
+{"name": "guzzlord", "types": ["dark", "dragon"], "stats": {"hp": 223, "attack": 101, "defense": 53, "special-attack": 97, "special-defense": 53, "speed": 43}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_8.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_8.json
index 5151b25..f4cea8d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_8.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_8.json
@@ -1,1 +1,1 @@
-{"name": "wartortle", "types": ["water"], "stats": {"speed": 58, "special-defense": 80, "special-attack": 65, "defense": 80, "attack": 63, "hp": 59}}
\ No newline at end of file
+{"name": "wartortle", "types": ["water"], "stats": {"hp": 59, "attack": 63, "defense": 80, "special-attack": 65, "special-defense": 80, "speed": 58}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_80.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_80.json
index 2c33b75..1e91ebd 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_80.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_80.json
@@ -1,1 +1,1 @@
-{"name": "slowbro", "types": ["psychic", "water"], "stats": {"speed": 30, "special-defense": 80, "special-attack": 100, "defense": 110, "attack": 75, "hp": 95}}
\ No newline at end of file
+{"name": "slowbro", "types": ["water", "psychic"], "stats": {"hp": 95, "attack": 75, "defense": 110, "special-attack": 100, "special-defense": 80, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_800.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_800.json
index 28b710b..136c403 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_800.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_800.json
@@ -1,1 +1,1 @@
-{"name": "necrozma", "types": ["psychic"], "stats": {"speed": 79, "special-defense": 89, "special-attack": 127, "defense": 101, "attack": 107, "hp": 97}}
\ No newline at end of file
+{"name": "necrozma", "types": ["psychic"], "stats": {"hp": 97, "attack": 107, "defense": 101, "special-attack": 127, "special-defense": 89, "speed": 79}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_801.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_801.json
index 96c1cef..16a9d52 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_801.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_801.json
@@ -1,1 +1,1 @@
-{"name": "magearna", "types": ["fairy", "steel"], "stats": {"speed": 65, "special-defense": 115, "special-attack": 130, "defense": 115, "attack": 95, "hp": 80}}
\ No newline at end of file
+{"name": "magearna", "types": ["steel", "fairy"], "stats": {"hp": 80, "attack": 95, "defense": 115, "special-attack": 130, "special-defense": 115, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_802.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_802.json
index cc00ca3..c2d4726 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_802.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_802.json
@@ -1,1 +1,1 @@
-{"name": "marshadow", "types": ["ghost", "fighting"], "stats": {"speed": 125, "special-defense": 90, "special-attack": 90, "defense": 80, "attack": 125, "hp": 90}}
\ No newline at end of file
+{"name": "marshadow", "types": ["fighting", "ghost"], "stats": {"hp": 90, "attack": 125, "defense": 80, "special-attack": 90, "special-defense": 90, "speed": 125}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_803.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_803.json
index 4068c96..9a77e4d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_803.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_803.json
@@ -1,1 +1,1 @@
-{"name": "poipole", "types": ["poison"], "stats": {"speed": 73, "special-defense": 67, "special-attack": 73, "defense": 67, "attack": 73, "hp": 67}}
\ No newline at end of file
+{"name": "poipole", "types": ["poison"], "stats": {"hp": 67, "attack": 73, "defense": 67, "special-attack": 73, "special-defense": 67, "speed": 73}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_804.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_804.json
index b35729d..113b65d 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_804.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_804.json
@@ -1,1 +1,1 @@
-{"name": "naganadel", "types": ["dragon", "poison"], "stats": {"speed": 121, "special-defense": 73, "special-attack": 127, "defense": 73, "attack": 73, "hp": 73}}
\ No newline at end of file
+{"name": "naganadel", "types": ["poison", "dragon"], "stats": {"hp": 73, "attack": 73, "defense": 73, "special-attack": 127, "special-defense": 73, "speed": 121}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_805.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_805.json
index 467adc8..375bbfb 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_805.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_805.json
@@ -1,1 +1,1 @@
-{"name": "stakataka", "types": ["steel", "rock"], "stats": {"speed": 13, "special-defense": 101, "special-attack": 53, "defense": 211, "attack": 131, "hp": 61}}
\ No newline at end of file
+{"name": "stakataka", "types": ["rock", "steel"], "stats": {"hp": 61, "attack": 131, "defense": 211, "special-attack": 53, "special-defense": 101, "speed": 13}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_806.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_806.json
index 31201a6..7811ea6 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_806.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_806.json
@@ -1,1 +1,1 @@
-{"name": "blacephalon", "types": ["ghost", "fire"], "stats": {"speed": 107, "special-defense": 79, "special-attack": 151, "defense": 53, "attack": 127, "hp": 53}}
\ No newline at end of file
+{"name": "blacephalon", "types": ["fire", "ghost"], "stats": {"hp": 53, "attack": 127, "defense": 53, "special-attack": 151, "special-defense": 79, "speed": 107}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_807.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_807.json
index 53e2962..cb625c8 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_807.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_807.json
@@ -1,1 +1,1 @@
-{"name": "zeraora", "types": ["electric"], "stats": {"speed": 143, "special-defense": 80, "special-attack": 102, "defense": 75, "attack": 112, "hp": 88}}
\ No newline at end of file
+{"name": "zeraora", "types": ["electric"], "stats": {"hp": 88, "attack": 112, "defense": 75, "special-attack": 102, "special-defense": 80, "speed": 143}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_81.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_81.json
index e8c0bc2..77fbeba 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_81.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_81.json
@@ -1,1 +1,1 @@
-{"name": "magnemite", "types": ["steel", "electric"], "stats": {"speed": 45, "special-defense": 55, "special-attack": 95, "defense": 70, "attack": 35, "hp": 25}}
\ No newline at end of file
+{"name": "magnemite", "types": ["electric", "steel"], "stats": {"hp": 25, "attack": 35, "defense": 70, "special-attack": 95, "special-defense": 55, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_810.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_810.json
new file mode 100644
index 0000000..c6a9b49
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_810.json
@@ -0,0 +1,1 @@
+{"name": "grookey", "types": [], "stats": {"hp": 50, "attack": 65, "defense": 50, "special-attack": 40, "special-defense": 40, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_811.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_811.json
new file mode 100644
index 0000000..9c863b1
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_811.json
@@ -0,0 +1,1 @@
+{"name": "thwackey", "types": [], "stats": {"hp": 70, "attack": 85, "defense": 70, "special-attack": 55, "special-defense": 60, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_812.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_812.json
new file mode 100644
index 0000000..733fa99
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_812.json
@@ -0,0 +1,1 @@
+{"name": "rillaboom", "types": [], "stats": {"hp": 100, "attack": 125, "defense": 90, "special-attack": 60, "special-defense": 70, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_813.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_813.json
new file mode 100644
index 0000000..f546b2e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_813.json
@@ -0,0 +1,1 @@
+{"name": "scorbunny", "types": [], "stats": {"hp": 50, "attack": 71, "defense": 40, "special-attack": 40, "special-defense": 40, "speed": 69}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_814.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_814.json
new file mode 100644
index 0000000..cc4b6d7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_814.json
@@ -0,0 +1,1 @@
+{"name": "raboot", "types": [], "stats": {"hp": 65, "attack": 86, "defense": 60, "special-attack": 55, "special-defense": 60, "speed": 94}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_815.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_815.json
new file mode 100644
index 0000000..9c084dd
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_815.json
@@ -0,0 +1,1 @@
+{"name": "cinderace", "types": [], "stats": {"hp": 80, "attack": 116, "defense": 75, "special-attack": 65, "special-defense": 75, "speed": 119}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_816.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_816.json
new file mode 100644
index 0000000..5ead435
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_816.json
@@ -0,0 +1,1 @@
+{"name": "sobble", "types": [], "stats": {"hp": 50, "attack": 40, "defense": 40, "special-attack": 70, "special-defense": 40, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_817.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_817.json
new file mode 100644
index 0000000..ab3eafc
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_817.json
@@ -0,0 +1,1 @@
+{"name": "drizzile", "types": [], "stats": {"hp": 65, "attack": 60, "defense": 55, "special-attack": 95, "special-defense": 55, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_818.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_818.json
new file mode 100644
index 0000000..e1e0919
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_818.json
@@ -0,0 +1,1 @@
+{"name": "inteleon", "types": [], "stats": {"hp": 70, "attack": 85, "defense": 65, "special-attack": 125, "special-defense": 65, "speed": 120}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_819.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_819.json
new file mode 100644
index 0000000..cb446b0
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_819.json
@@ -0,0 +1,1 @@
+{"name": "skwovet", "types": [], "stats": {"hp": 70, "attack": 55, "defense": 55, "special-attack": 35, "special-defense": 35, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_82.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_82.json
index 27b8dfe..663010b 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_82.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_82.json
@@ -1,1 +1,1 @@
-{"name": "magneton", "types": ["steel", "electric"], "stats": {"speed": 70, "special-defense": 70, "special-attack": 120, "defense": 95, "attack": 60, "hp": 50}}
\ No newline at end of file
+{"name": "magneton", "types": ["electric", "steel"], "stats": {"hp": 50, "attack": 60, "defense": 95, "special-attack": 120, "special-defense": 70, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_820.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_820.json
new file mode 100644
index 0000000..7f49f71
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_820.json
@@ -0,0 +1,1 @@
+{"name": "greedent", "types": [], "stats": {"hp": 120, "attack": 95, "defense": 95, "special-attack": 55, "special-defense": 75, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_821.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_821.json
new file mode 100644
index 0000000..7670606
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_821.json
@@ -0,0 +1,1 @@
+{"name": "rookidee", "types": [], "stats": {"hp": 38, "attack": 47, "defense": 35, "special-attack": 33, "special-defense": 35, "speed": 57}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_822.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_822.json
new file mode 100644
index 0000000..1ee596b
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_822.json
@@ -0,0 +1,1 @@
+{"name": "corvisquire", "types": [], "stats": {"hp": 68, "attack": 67, "defense": 55, "special-attack": 43, "special-defense": 55, "speed": 77}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_823.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_823.json
new file mode 100644
index 0000000..f8a4618
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_823.json
@@ -0,0 +1,1 @@
+{"name": "corviknight", "types": [], "stats": {"hp": 98, "attack": 87, "defense": 105, "special-attack": 53, "special-defense": 85, "speed": 67}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_824.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_824.json
new file mode 100644
index 0000000..75be15f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_824.json
@@ -0,0 +1,1 @@
+{"name": "blipbug", "types": [], "stats": {"hp": 25, "attack": 20, "defense": 20, "special-attack": 25, "special-defense": 45, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_825.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_825.json
new file mode 100644
index 0000000..e847d42
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_825.json
@@ -0,0 +1,1 @@
+{"name": "dottler", "types": [], "stats": {"hp": 50, "attack": 35, "defense": 80, "special-attack": 50, "special-defense": 90, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_826.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_826.json
new file mode 100644
index 0000000..02d37e4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_826.json
@@ -0,0 +1,1 @@
+{"name": "orbeetle", "types": [], "stats": {"hp": 60, "attack": 45, "defense": 110, "special-attack": 80, "special-defense": 120, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_827.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_827.json
new file mode 100644
index 0000000..99922c9
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_827.json
@@ -0,0 +1,1 @@
+{"name": "nickit", "types": [], "stats": {"hp": 40, "attack": 28, "defense": 28, "special-attack": 47, "special-defense": 52, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_828.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_828.json
new file mode 100644
index 0000000..2cf6eab
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_828.json
@@ -0,0 +1,1 @@
+{"name": "thievul", "types": [], "stats": {"hp": 70, "attack": 58, "defense": 58, "special-attack": 87, "special-defense": 92, "speed": 90}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_829.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_829.json
new file mode 100644
index 0000000..7e6a559
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_829.json
@@ -0,0 +1,1 @@
+{"name": "gossifleur", "types": [], "stats": {"hp": 40, "attack": 40, "defense": 60, "special-attack": 40, "special-defense": 60, "speed": 10}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_83.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_83.json
index 7c523af..d35a62f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_83.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_83.json
@@ -1,1 +1,1 @@
-{"name": "farfetchd", "types": ["flying", "normal"], "stats": {"speed": 60, "special-defense": 62, "special-attack": 58, "defense": 55, "attack": 90, "hp": 52}}
\ No newline at end of file
+{"name": "farfetchd", "types": ["normal", "flying"], "stats": {"hp": 52, "attack": 90, "defense": 55, "special-attack": 58, "special-defense": 62, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_830.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_830.json
new file mode 100644
index 0000000..b2b3f85
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_830.json
@@ -0,0 +1,1 @@
+{"name": "eldegoss", "types": [], "stats": {"hp": 60, "attack": 50, "defense": 90, "special-attack": 80, "special-defense": 120, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_831.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_831.json
new file mode 100644
index 0000000..e98c43a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_831.json
@@ -0,0 +1,1 @@
+{"name": "wooloo", "types": [], "stats": {"hp": 42, "attack": 40, "defense": 55, "special-attack": 40, "special-defense": 45, "speed": 48}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_832.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_832.json
new file mode 100644
index 0000000..55236fb
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_832.json
@@ -0,0 +1,1 @@
+{"name": "dubwool", "types": [], "stats": {"hp": 72, "attack": 80, "defense": 100, "special-attack": 60, "special-defense": 90, "speed": 88}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_833.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_833.json
new file mode 100644
index 0000000..b8e2aab
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_833.json
@@ -0,0 +1,1 @@
+{"name": "chewtle", "types": [], "stats": {"hp": 50, "attack": 64, "defense": 50, "special-attack": 38, "special-defense": 38, "speed": 44}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_834.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_834.json
new file mode 100644
index 0000000..3666e11
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_834.json
@@ -0,0 +1,1 @@
+{"name": "drednaw", "types": [], "stats": {"hp": 90, "attack": 115, "defense": 90, "special-attack": 48, "special-defense": 68, "speed": 74}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_835.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_835.json
new file mode 100644
index 0000000..0fbe4f2
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_835.json
@@ -0,0 +1,1 @@
+{"name": "yamper", "types": [], "stats": {"hp": 59, "attack": 45, "defense": 50, "special-attack": 40, "special-defense": 50, "speed": 26}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_836.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_836.json
new file mode 100644
index 0000000..89dd9b2
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_836.json
@@ -0,0 +1,1 @@
+{"name": "boltund", "types": [], "stats": {"hp": 69, "attack": 90, "defense": 60, "special-attack": 90, "special-defense": 60, "speed": 121}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_837.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_837.json
new file mode 100644
index 0000000..e532656
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_837.json
@@ -0,0 +1,1 @@
+{"name": "rolycoly", "types": [], "stats": {"hp": 30, "attack": 40, "defense": 50, "special-attack": 40, "special-defense": 50, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_838.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_838.json
new file mode 100644
index 0000000..f39845e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_838.json
@@ -0,0 +1,1 @@
+{"name": "carkol", "types": [], "stats": {"hp": 80, "attack": 60, "defense": 90, "special-attack": 60, "special-defense": 70, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_839.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_839.json
new file mode 100644
index 0000000..b90180e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_839.json
@@ -0,0 +1,1 @@
+{"name": "coalossal", "types": [], "stats": {"hp": 110, "attack": 80, "defense": 120, "special-attack": 80, "special-defense": 90, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_84.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_84.json
index a2f048f..ba21048 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_84.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_84.json
@@ -1,1 +1,1 @@
-{"name": "doduo", "types": ["flying", "normal"], "stats": {"speed": 75, "special-defense": 35, "special-attack": 35, "defense": 45, "attack": 85, "hp": 35}}
\ No newline at end of file
+{"name": "doduo", "types": ["normal", "flying"], "stats": {"hp": 35, "attack": 85, "defense": 45, "special-attack": 35, "special-defense": 35, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_840.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_840.json
new file mode 100644
index 0000000..c4152fc
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_840.json
@@ -0,0 +1,1 @@
+{"name": "applin", "types": [], "stats": {"hp": 40, "attack": 40, "defense": 80, "special-attack": 40, "special-defense": 40, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_841.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_841.json
new file mode 100644
index 0000000..803be36
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_841.json
@@ -0,0 +1,1 @@
+{"name": "flapple", "types": [], "stats": {"hp": 70, "attack": 110, "defense": 80, "special-attack": 95, "special-defense": 60, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_842.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_842.json
new file mode 100644
index 0000000..6ced465
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_842.json
@@ -0,0 +1,1 @@
+{"name": "appletun", "types": [], "stats": {"hp": 110, "attack": 85, "defense": 80, "special-attack": 100, "special-defense": 80, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_843.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_843.json
new file mode 100644
index 0000000..913ff17
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_843.json
@@ -0,0 +1,1 @@
+{"name": "silicobra", "types": [], "stats": {"hp": 52, "attack": 57, "defense": 75, "special-attack": 35, "special-defense": 50, "speed": 46}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_844.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_844.json
new file mode 100644
index 0000000..9521317
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_844.json
@@ -0,0 +1,1 @@
+{"name": "sandaconda", "types": [], "stats": {"hp": 72, "attack": 107, "defense": 125, "special-attack": 65, "special-defense": 70, "speed": 71}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_845.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_845.json
new file mode 100644
index 0000000..f33cb62
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_845.json
@@ -0,0 +1,1 @@
+{"name": "cramorant", "types": [], "stats": {"hp": 70, "attack": 85, "defense": 55, "special-attack": 85, "special-defense": 95, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_846.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_846.json
new file mode 100644
index 0000000..38b753d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_846.json
@@ -0,0 +1,1 @@
+{"name": "arrokuda", "types": [], "stats": {"hp": 41, "attack": 63, "defense": 40, "special-attack": 40, "special-defense": 30, "speed": 66}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_847.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_847.json
new file mode 100644
index 0000000..6d0efed
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_847.json
@@ -0,0 +1,1 @@
+{"name": "barraskewda", "types": [], "stats": {"hp": 61, "attack": 123, "defense": 60, "special-attack": 60, "special-defense": 50, "speed": 136}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_848.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_848.json
new file mode 100644
index 0000000..5ce7e60
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_848.json
@@ -0,0 +1,1 @@
+{"name": "toxel", "types": [], "stats": {"hp": 40, "attack": 38, "defense": 35, "special-attack": 54, "special-defense": 35, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_849.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_849.json
new file mode 100644
index 0000000..dc1420e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_849.json
@@ -0,0 +1,1 @@
+{"name": "toxtricity", "types": [], "stats": {"hp": 75, "attack": 98, "defense": 70, "special-attack": 114, "special-defense": 70, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_85.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_85.json
index 98a62d3..1a2b444 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_85.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_85.json
@@ -1,1 +1,1 @@
-{"name": "dodrio", "types": ["flying", "normal"], "stats": {"speed": 110, "special-defense": 60, "special-attack": 60, "defense": 70, "attack": 110, "hp": 60}}
\ No newline at end of file
+{"name": "dodrio", "types": ["normal", "flying"], "stats": {"hp": 60, "attack": 110, "defense": 70, "special-attack": 60, "special-defense": 60, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_850.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_850.json
new file mode 100644
index 0000000..511fae2
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_850.json
@@ -0,0 +1,1 @@
+{"name": "sizzlipede", "types": [], "stats": {"hp": 50, "attack": 65, "defense": 45, "special-attack": 50, "special-defense": 50, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_851.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_851.json
new file mode 100644
index 0000000..350ab5d
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_851.json
@@ -0,0 +1,1 @@
+{"name": "centiskorch", "types": [], "stats": {"hp": 100, "attack": 115, "defense": 65, "special-attack": 90, "special-defense": 90, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_852.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_852.json
new file mode 100644
index 0000000..3985712
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_852.json
@@ -0,0 +1,1 @@
+{"name": "clobbopus", "types": [], "stats": {"hp": 50, "attack": 68, "defense": 60, "special-attack": 50, "special-defense": 50, "speed": 32}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_853.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_853.json
new file mode 100644
index 0000000..a94b592
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_853.json
@@ -0,0 +1,1 @@
+{"name": "grapploct", "types": [], "stats": {"hp": 80, "attack": 118, "defense": 90, "special-attack": 70, "special-defense": 80, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_854.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_854.json
new file mode 100644
index 0000000..926fea3
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_854.json
@@ -0,0 +1,1 @@
+{"name": "sinistea", "types": [], "stats": {"hp": 40, "attack": 45, "defense": 45, "special-attack": 74, "special-defense": 54, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_855.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_855.json
new file mode 100644
index 0000000..b26a097
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_855.json
@@ -0,0 +1,1 @@
+{"name": "polteageist", "types": [], "stats": {"hp": 60, "attack": 65, "defense": 65, "special-attack": 134, "special-defense": 114, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_856.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_856.json
new file mode 100644
index 0000000..590f0e7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_856.json
@@ -0,0 +1,1 @@
+{"name": "hatenna", "types": [], "stats": {"hp": 42, "attack": 30, "defense": 45, "special-attack": 56, "special-defense": 53, "speed": 39}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_857.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_857.json
new file mode 100644
index 0000000..0e0c2e9
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_857.json
@@ -0,0 +1,1 @@
+{"name": "hattrem", "types": [], "stats": {"hp": 57, "attack": 40, "defense": 65, "special-attack": 86, "special-defense": 73, "speed": 49}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_858.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_858.json
new file mode 100644
index 0000000..aa98224
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_858.json
@@ -0,0 +1,1 @@
+{"name": "hatterene", "types": [], "stats": {"hp": 57, "attack": 90, "defense": 95, "special-attack": 136, "special-defense": 103, "speed": 29}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_859.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_859.json
new file mode 100644
index 0000000..3bdde74
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_859.json
@@ -0,0 +1,1 @@
+{"name": "impidimp", "types": [], "stats": {"hp": 45, "attack": 45, "defense": 30, "special-attack": 55, "special-defense": 40, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_86.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_86.json
index c134d69..3798d90 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_86.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_86.json
@@ -1,1 +1,1 @@
-{"name": "seel", "types": ["water"], "stats": {"speed": 45, "special-defense": 70, "special-attack": 45, "defense": 55, "attack": 45, "hp": 65}}
\ No newline at end of file
+{"name": "seel", "types": ["water"], "stats": {"hp": 65, "attack": 45, "defense": 55, "special-attack": 45, "special-defense": 70, "speed": 45}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_860.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_860.json
new file mode 100644
index 0000000..44d6b27
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_860.json
@@ -0,0 +1,1 @@
+{"name": "morgrem", "types": [], "stats": {"hp": 65, "attack": 60, "defense": 45, "special-attack": 75, "special-defense": 55, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_861.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_861.json
new file mode 100644
index 0000000..9f5c395
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_861.json
@@ -0,0 +1,1 @@
+{"name": "grimmsnarl", "types": [], "stats": {"hp": 95, "attack": 120, "defense": 65, "special-attack": 95, "special-defense": 75, "speed": 60}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_862.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_862.json
new file mode 100644
index 0000000..72931d8
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_862.json
@@ -0,0 +1,1 @@
+{"name": "obstagoon", "types": [], "stats": {"hp": 93, "attack": 90, "defense": 101, "special-attack": 60, "special-defense": 81, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_863.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_863.json
new file mode 100644
index 0000000..7301d1c
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_863.json
@@ -0,0 +1,1 @@
+{"name": "perrserker", "types": [], "stats": {"hp": 70, "attack": 110, "defense": 100, "special-attack": 50, "special-defense": 60, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_864.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_864.json
new file mode 100644
index 0000000..b9d617f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_864.json
@@ -0,0 +1,1 @@
+{"name": "cursola", "types": [], "stats": {"hp": 60, "attack": 95, "defense": 50, "special-attack": 145, "special-defense": 130, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_865.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_865.json
new file mode 100644
index 0000000..84db5f7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_865.json
@@ -0,0 +1,1 @@
+{"name": "sirfetch", "types": [], "stats": {"hp": 62, "attack": 135, "defense": 95, "special-attack": 68, "special-defense": 82, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_866.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_866.json
new file mode 100644
index 0000000..be6cf6f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_866.json
@@ -0,0 +1,1 @@
+{"name": "mr", "types": [], "stats": {"hp": 80, "attack": 85, "defense": 75, "special-attack": 110, "special-defense": 100, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_867.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_867.json
new file mode 100644
index 0000000..3b3091f
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_867.json
@@ -0,0 +1,1 @@
+{"name": "runerigus", "types": [], "stats": {"hp": 58, "attack": 95, "defense": 145, "special-attack": 50, "special-defense": 105, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_868.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_868.json
new file mode 100644
index 0000000..42f0fc5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_868.json
@@ -0,0 +1,1 @@
+{"name": "milcery", "types": [], "stats": {"hp": 45, "attack": 40, "defense": 40, "special-attack": 50, "special-defense": 61, "speed": 34}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_869.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_869.json
new file mode 100644
index 0000000..959211a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_869.json
@@ -0,0 +1,1 @@
+{"name": "alcremie", "types": [], "stats": {"hp": 65, "attack": 60, "defense": 75, "special-attack": 110, "special-defense": 121, "speed": 64}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_87.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_87.json
index f8507bb..5e05eac 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_87.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_87.json
@@ -1,1 +1,1 @@
-{"name": "dewgong", "types": ["ice", "water"], "stats": {"speed": 70, "special-defense": 95, "special-attack": 70, "defense": 80, "attack": 70, "hp": 90}}
\ No newline at end of file
+{"name": "dewgong", "types": ["water", "ice"], "stats": {"hp": 90, "attack": 70, "defense": 80, "special-attack": 70, "special-defense": 95, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_870.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_870.json
new file mode 100644
index 0000000..34b5ee1
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_870.json
@@ -0,0 +1,1 @@
+{"name": "falinks", "types": [], "stats": {"hp": 65, "attack": 100, "defense": 100, "special-attack": 70, "special-defense": 60, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_871.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_871.json
new file mode 100644
index 0000000..50af268
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_871.json
@@ -0,0 +1,1 @@
+{"name": "pincurchin", "types": [], "stats": {"hp": 48, "attack": 101, "defense": 95, "special-attack": 91, "special-defense": 85, "speed": 15}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_872.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_872.json
new file mode 100644
index 0000000..985981a
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_872.json
@@ -0,0 +1,1 @@
+{"name": "snom", "types": [], "stats": {"hp": 30, "attack": 25, "defense": 35, "special-attack": 45, "special-defense": 30, "speed": 20}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_873.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_873.json
new file mode 100644
index 0000000..13f8257
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_873.json
@@ -0,0 +1,1 @@
+{"name": "frosmoth", "types": [], "stats": {"hp": 70, "attack": 65, "defense": 60, "special-attack": 125, "special-defense": 90, "speed": 65}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_874.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_874.json
new file mode 100644
index 0000000..64b78aa
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_874.json
@@ -0,0 +1,1 @@
+{"name": "stonjourner", "types": [], "stats": {"hp": 100, "attack": 125, "defense": 135, "special-attack": 20, "special-defense": 20, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_875.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_875.json
new file mode 100644
index 0000000..d344faf
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_875.json
@@ -0,0 +1,1 @@
+{"name": "eiscue", "types": [], "stats": {"hp": 75, "attack": 80, "defense": 110, "special-attack": 65, "special-defense": 90, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_876.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_876.json
new file mode 100644
index 0000000..0154708
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_876.json
@@ -0,0 +1,1 @@
+{"name": "indeedee", "types": [], "stats": {"hp": 60, "attack": 65, "defense": 55, "special-attack": 105, "special-defense": 95, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_877.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_877.json
new file mode 100644
index 0000000..f5a2651
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_877.json
@@ -0,0 +1,1 @@
+{"name": "morpeko", "types": [], "stats": {"hp": 58, "attack": 95, "defense": 58, "special-attack": 70, "special-defense": 58, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_878.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_878.json
new file mode 100644
index 0000000..25b8005
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_878.json
@@ -0,0 +1,1 @@
+{"name": "cufant", "types": [], "stats": {"hp": 72, "attack": 80, "defense": 49, "special-attack": 40, "special-defense": 49, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_879.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_879.json
new file mode 100644
index 0000000..b49b10e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_879.json
@@ -0,0 +1,1 @@
+{"name": "copperajah", "types": [], "stats": {"hp": 122, "attack": 130, "defense": 69, "special-attack": 80, "special-defense": 69, "speed": 30}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_88.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_88.json
index 82b38e2..2759df9 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_88.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_88.json
@@ -1,1 +1,1 @@
-{"name": "grimer", "types": ["poison"], "stats": {"speed": 25, "special-defense": 50, "special-attack": 40, "defense": 50, "attack": 80, "hp": 80}}
\ No newline at end of file
+{"name": "grimer", "types": ["poison"], "stats": {"hp": 80, "attack": 80, "defense": 50, "special-attack": 40, "special-defense": 50, "speed": 25}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_880.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_880.json
new file mode 100644
index 0000000..0a48476
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_880.json
@@ -0,0 +1,1 @@
+{"name": "dracozolt", "types": [], "stats": {"hp": 90, "attack": 100, "defense": 90, "special-attack": 80, "special-defense": 70, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_881.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_881.json
new file mode 100644
index 0000000..e372edb
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_881.json
@@ -0,0 +1,1 @@
+{"name": "arctozolt", "types": [], "stats": {"hp": 90, "attack": 100, "defense": 90, "special-attack": 90, "special-defense": 80, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_882.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_882.json
new file mode 100644
index 0000000..8bcbfe9
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_882.json
@@ -0,0 +1,1 @@
+{"name": "dracovish", "types": [], "stats": {"hp": 90, "attack": 90, "defense": 100, "special-attack": 70, "special-defense": 80, "speed": 75}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_883.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_883.json
new file mode 100644
index 0000000..31ab7fc
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_883.json
@@ -0,0 +1,1 @@
+{"name": "arctovish", "types": [], "stats": {"hp": 90, "attack": 90, "defense": 100, "special-attack": 80, "special-defense": 90, "speed": 55}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_884.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_884.json
new file mode 100644
index 0000000..9753e53
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_884.json
@@ -0,0 +1,1 @@
+{"name": "duraludon", "types": [], "stats": {"hp": 70, "attack": 95, "defense": 115, "special-attack": 120, "special-defense": 50, "speed": 85}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_885.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_885.json
new file mode 100644
index 0000000..dce1da7
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_885.json
@@ -0,0 +1,1 @@
+{"name": "dreepy", "types": [], "stats": {"hp": 28, "attack": 60, "defense": 30, "special-attack": 40, "special-defense": 30, "speed": 82}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_886.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_886.json
new file mode 100644
index 0000000..ab173a5
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_886.json
@@ -0,0 +1,1 @@
+{"name": "drakloak", "types": [], "stats": {"hp": 68, "attack": 80, "defense": 50, "special-attack": 60, "special-defense": 50, "speed": 102}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_887.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_887.json
new file mode 100644
index 0000000..634273c
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_887.json
@@ -0,0 +1,1 @@
+{"name": "dragapult", "types": [], "stats": {"hp": 88, "attack": 120, "defense": 75, "special-attack": 100, "special-defense": 75, "speed": 142}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_888.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_888.json
new file mode 100644
index 0000000..2469f12
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_888.json
@@ -0,0 +1,1 @@
+{"name": "zacian", "types": [], "stats": {"hp": 92, "attack": 130, "defense": 115, "special-attack": 80, "special-defense": 115, "speed": 138}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_889.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_889.json
new file mode 100644
index 0000000..7085d48
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_889.json
@@ -0,0 +1,1 @@
+{"name": "zamazenta", "types": [], "stats": {"hp": 92, "attack": 130, "defense": 115, "special-attack": 80, "special-defense": 115, "speed": 138}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_89.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_89.json
index 5abfa88..83a97de 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_89.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_89.json
@@ -1,1 +1,1 @@
-{"name": "muk", "types": ["poison"], "stats": {"speed": 50, "special-defense": 100, "special-attack": 65, "defense": 75, "attack": 105, "hp": 105}}
\ No newline at end of file
+{"name": "muk", "types": ["poison"], "stats": {"hp": 105, "attack": 105, "defense": 75, "special-attack": 65, "special-defense": 100, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_890.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_890.json
new file mode 100644
index 0000000..f483630
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_890.json
@@ -0,0 +1,1 @@
+{"name": "eternatus", "types": [], "stats": {"hp": 140, "attack": 85, "defense": 95, "special-attack": 145, "special-defense": 95, "speed": 130}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_891.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_891.json
new file mode 100644
index 0000000..f9eb8c4
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_891.json
@@ -0,0 +1,1 @@
+{"name": "kubfu", "types": [], "stats": {"hp": 60, "attack": 90, "defense": 60, "special-attack": 53, "special-defense": 50, "speed": 72}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_892.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_892.json
new file mode 100644
index 0000000..27d433b
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_892.json
@@ -0,0 +1,1 @@
+{"name": "urshifu", "types": [], "stats": {"hp": 100, "attack": 130, "defense": 100, "special-attack": 63, "special-defense": 60, "speed": 97}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_893.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_893.json
new file mode 100644
index 0000000..967291e
--- /dev/null
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_893.json
@@ -0,0 +1,1 @@
+{"name": "zarude", "types": [], "stats": {"hp": 105, "attack": 120, "defense": 105, "special-attack": 70, "special-defense": 95, "speed": 105}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_9.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_9.json
index 48298aa..512d88f 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_9.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_9.json
@@ -1,1 +1,1 @@
-{"name": "blastoise", "types": ["water"], "stats": {"speed": 78, "special-defense": 105, "special-attack": 85, "defense": 100, "attack": 83, "hp": 79}}
\ No newline at end of file
+{"name": "blastoise", "types": ["water"], "stats": {"hp": 79, "attack": 83, "defense": 100, "special-attack": 85, "special-defense": 105, "speed": 78}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_90.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_90.json
index 969e86d..dc54a04 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_90.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_90.json
@@ -1,1 +1,1 @@
-{"name": "shellder", "types": ["water"], "stats": {"speed": 40, "special-defense": 25, "special-attack": 45, "defense": 100, "attack": 65, "hp": 30}}
\ No newline at end of file
+{"name": "shellder", "types": ["water"], "stats": {"hp": 30, "attack": 65, "defense": 100, "special-attack": 45, "special-defense": 25, "speed": 40}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_91.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_91.json
index 2695575..8360830 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_91.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_91.json
@@ -1,1 +1,1 @@
-{"name": "cloyster", "types": ["ice", "water"], "stats": {"speed": 70, "special-defense": 45, "special-attack": 85, "defense": 180, "attack": 95, "hp": 50}}
\ No newline at end of file
+{"name": "cloyster", "types": ["water", "ice"], "stats": {"hp": 50, "attack": 95, "defense": 180, "special-attack": 85, "special-defense": 45, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_92.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_92.json
index 470e37f..80b03c2 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_92.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_92.json
@@ -1,1 +1,1 @@
-{"name": "gastly", "types": ["poison", "ghost"], "stats": {"speed": 80, "special-defense": 35, "special-attack": 100, "defense": 30, "attack": 35, "hp": 30}}
\ No newline at end of file
+{"name": "gastly", "types": ["ghost", "poison"], "stats": {"hp": 30, "attack": 35, "defense": 30, "special-attack": 100, "special-defense": 35, "speed": 80}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_93.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_93.json
index 46c48c2..889b4be 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_93.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_93.json
@@ -1,1 +1,1 @@
-{"name": "haunter", "types": ["poison", "ghost"], "stats": {"speed": 95, "special-defense": 55, "special-attack": 115, "defense": 45, "attack": 50, "hp": 45}}
\ No newline at end of file
+{"name": "haunter", "types": ["ghost", "poison"], "stats": {"hp": 45, "attack": 50, "defense": 45, "special-attack": 115, "special-defense": 55, "speed": 95}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_94.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_94.json
index e033182..ddfef91 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_94.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_94.json
@@ -1,1 +1,1 @@
-{"name": "gengar", "types": ["poison", "ghost"], "stats": {"speed": 110, "special-defense": 75, "special-attack": 130, "defense": 60, "attack": 65, "hp": 60}}
\ No newline at end of file
+{"name": "gengar", "types": ["ghost", "poison"], "stats": {"hp": 60, "attack": 65, "defense": 60, "special-attack": 130, "special-defense": 75, "speed": 110}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_95.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_95.json
index 7cf3c65..caa8259 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_95.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_95.json
@@ -1,1 +1,1 @@
-{"name": "onix", "types": ["ground", "rock"], "stats": {"speed": 70, "special-defense": 45, "special-attack": 30, "defense": 160, "attack": 45, "hp": 35}}
\ No newline at end of file
+{"name": "onix", "types": ["rock", "ground"], "stats": {"hp": 35, "attack": 45, "defense": 160, "special-attack": 30, "special-defense": 45, "speed": 70}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_96.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_96.json
index 1e0ff4d..57e9598 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_96.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_96.json
@@ -1,1 +1,1 @@
-{"name": "drowzee", "types": ["psychic"], "stats": {"speed": 42, "special-defense": 90, "special-attack": 43, "defense": 45, "attack": 48, "hp": 60}}
\ No newline at end of file
+{"name": "drowzee", "types": ["psychic"], "stats": {"hp": 60, "attack": 48, "defense": 45, "special-attack": 43, "special-defense": 90, "speed": 42}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_97.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_97.json
index 7d3d5b5..a0ca5db 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_97.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_97.json
@@ -1,1 +1,1 @@
-{"name": "hypno", "types": ["psychic"], "stats": {"speed": 67, "special-defense": 115, "special-attack": 73, "defense": 70, "attack": 73, "hp": 85}}
\ No newline at end of file
+{"name": "hypno", "types": ["psychic"], "stats": {"hp": 85, "attack": 73, "defense": 70, "special-attack": 73, "special-defense": 115, "speed": 67}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_98.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_98.json
index 33c3787..670faf7 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_98.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_98.json
@@ -1,1 +1,1 @@
-{"name": "krabby", "types": ["water"], "stats": {"speed": 50, "special-defense": 25, "special-attack": 25, "defense": 90, "attack": 105, "hp": 30}}
\ No newline at end of file
+{"name": "krabby", "types": ["water"], "stats": {"hp": 30, "attack": 105, "defense": 90, "special-attack": 25, "special-defense": 25, "speed": 50}}
\ No newline at end of file
diff --git a/pokemonlib/pokemon_data/pokemon_properties/pokemon_99.json b/pokemonlib/pokemon_data/pokemon_properties/pokemon_99.json
index 2f7f619..7fb6176 100644
--- a/pokemonlib/pokemon_data/pokemon_properties/pokemon_99.json
+++ b/pokemonlib/pokemon_data/pokemon_properties/pokemon_99.json
@@ -1,1 +1,1 @@
-{"name": "kingler", "types": ["water"], "stats": {"speed": 75, "special-defense": 50, "special-attack": 50, "defense": 115, "attack": 130, "hp": 55}}
\ No newline at end of file
+{"name": "kingler", "types": ["water"], "stats": {"hp": 55, "attack": 130, "defense": 115, "special-attack": 50, "special-defense": 50, "speed": 75}}
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 6e01b92..f229360 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,1 @@
 requests
-cryptography
-pyarmor
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 9be1e56..88a6fe5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def run(self):
 
 setuptools.setup(
     name="pokemonlib",
-    version="0.0.4",
+    version="0.0.5",
     author="arthuro555",
     author_email="papinrouge@gmail.com",
     description="An implementation of pokemon algorithms",
@@ -29,7 +29,7 @@ def run(self):
     long_description_content_type="text/markdown",
     url="https://github.com/arthuro555/pokemonlib",
     packages=setuptools.find_packages(),
-    install_requires=['cryptography', 'pyglet', 'requests'],
+    install_requires=['requests'],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
@@ -44,5 +44,9 @@ def run(self):
     },
     cmdclass={
         'clean': CleanCommand,
-    }
+    },
+    entry_points='''
+        [console_scripts]
+        pokeproject=pokemonlib.cli.pokeproject:pokeproject
+    ''',
 )


Test patch:
diff --git a/build/lib/pokemonlib/testFeatures/__init__.py b/build/lib/pokemonlib/testFeatures/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/build/lib/pokemonlib/testFeatures/pandatassst.py b/build/lib/pokemonlib/testFeatures/pandatassst.py
deleted file mode 100644
index 80d1b3f..0000000
--- a/build/lib/pokemonlib/testFeatures/pandatassst.py
+++ /dev/null
@@ -1,35 +0,0 @@
-def graphictest():
-    from math import pi, sin, cos
-    from direct.showbase.ShowBase import ShowBase
-    from direct.task import Task
-    from direct.actor.Actor import Actor
-
-    class MyApp(ShowBase):
-
-        def __init__(self):
-            ShowBase.__init__(self)
-
-            # Load the environment model.
-            self.scene = self.loader.loadModel("models/environment")
-            # Reparent the model to render.
-            self.scene.reparentTo(self.render)
-            # Apply scale and position transforms on the model.
-            self.scene.setScale(0.25, 0.25, 0.25)
-            self.scene.setPos(-8, 42, 0)
-            self.taskMgr.add(self.spinCameraTask, "SpinCameraTask")
-            self.pandaActor = Actor("models/panda-model",
-                                    {"walk": "models/panda-walk4"})
-            self.pandaActor.setScale(0.005, 0.005, 0.005)
-            self.pandaActor.reparentTo(self.render)
-            # Loop its animation.
-            self.pandaActor.loop("walk")
-
-        def spinCameraTask(self, task):
-            angleDegrees = task.time * 6.0
-            angleRadians = angleDegrees * (pi / 180.0)
-            self.camera.setPos(20 * sin(angleRadians), -20.0 * cos(angleRadians), 3)
-            self.camera.setHpr(angleDegrees, 0, 0)
-            return Task.cont
-
-    app = MyApp()
-    app.run()
diff --git a/docs/source/pokemonlib.testFeatures.rst b/docs/source/pokemonlib.testFeatures.rst
new file mode 100644
index 0000000..5aa5600
--- /dev/null
+++ b/docs/source/pokemonlib.testFeatures.rst
@@ -0,0 +1,22 @@
+pokemonlib.testFeatures package
+===============================
+
+Submodules
+----------
+
+pokemonlib.testFeatures.pandatassst module
+------------------------------------------
+
+.. automodule:: pokemonlib.testFeatures.pandatassst
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: pokemonlib.testFeatures
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/pokemonlib/testFeatures/__init__.py b/pokemonlib/testFeatures/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pokemonlib/testFeatures/pandatassst.py b/pokemonlib/testFeatures/pandatassst.py
deleted file mode 100644
index 80d1b3f..0000000
--- a/pokemonlib/testFeatures/pandatassst.py
+++ /dev/null
@@ -1,35 +0,0 @@
-def graphictest():
-    from math import pi, sin, cos
-    from direct.showbase.ShowBase import ShowBase
-    from direct.task import Task
-    from direct.actor.Actor import Actor
-
-    class MyApp(ShowBase):
-
-        def __init__(self):
-            ShowBase.__init__(self)
-
-            # Load the environment model.
-            self.scene = self.loader.loadModel("models/environment")
-            # Reparent the model to render.
-            self.scene.reparentTo(self.render)
-            # Apply scale and position transforms on the model.
-            self.scene.setScale(0.25, 0.25, 0.25)
-            self.scene.setPos(-8, 42, 0)
-            self.taskMgr.add(self.spinCameraTask, "SpinCameraTask")
-            self.pandaActor = Actor("models/panda-model",
-                                    {"walk": "models/panda-walk4"})
-            self.pandaActor.setScale(0.005, 0.005, 0.005)
-            self.pandaActor.reparentTo(self.render)
-            # Loop its animation.
-            self.pandaActor.loop("walk")
-
-        def spinCameraTask(self, task):
-            angleDegrees = task.time * 6.0
-            angleRadians = angleDegrees * (pi / 180.0)
-            self.camera.setPos(20 * sin(angleRadians), -20.0 * cos(angleRadians), 3)
-            self.camera.setHpr(angleDegrees, 0, 0)
-            return Task.cont
-
-    app = MyApp()
-    app.run()
diff --git a/test.py b/test.py
index 9f36055..62e4d77 100644
--- a/test.py
+++ b/test.py
@@ -1,11 +1,11 @@
 import unittest
 from random import randint
-from pokemonlib.GameClasses.PokemonClass import Pokemon, Box, Team
+from pokemonlib.Core.Pokemon import Pokemon, Box, Team
 
 
 class TestPokemon(unittest.TestCase):
     def test_pokemon_init(self):
-        identifier = randint(0,800)
+        identifier = randint(1, 800)
         pokemon = Pokemon(identifier)
         self.assertEqual(pokemon._Pokemon__id, identifier)
 
@@ -19,21 +19,21 @@ def test_pokemon_stats(self):
         pokemon = Pokemon(identifier)
         attacks = {1: ["Thunderbolt", 20, True], 2: ["Poop", 40, True], 3: ["Earthquake", 40, True],
                    4: ["Scratch", 40, True]}
-        self.assertEqual(pokemon.getstats(), {"speed": 90, "defsp": 50, "attksp": 50, "def": 40, "attk": 55,
-                                              "hp": 35, "attacks": attacks})
+        self.assertEqual(pokemon.get_stats(), {"speed": 90, "defsp": 50, "attksp": 50, "def": 40, "attk": 55,
+                                               "hp": 35, "attacks": attacks})
 
 
 class TestTeam(unittest.TestCase):
     def test_team_one_pokemon(self):
-        identifier = randint(0, 800)
+        identifier = randint(1, 800)
         pokemon = Pokemon(identifier)
         team = Team(pokemon)
         self.assertEqual(team._Team__pokemonlist[0]._Pokemon__id, identifier)
 
     def test_team_many_pokemon(self):
-        identifier = randint(0, 800)
+        identifier = randint(1, 800)
         pokemon = Pokemon(identifier)
-        identifier2 = randint(0, 800)
+        identifier2 = randint(1, 800)
         pokemon2 = Pokemon(identifier2)
         team = Team(pokemon, pokemon2)
         self.assertEqual(team._Team__pokemonlist[0]._Pokemon__id, identifier)
@@ -42,20 +42,35 @@ def test_team_many_pokemon(self):
 
 class TestBox(unittest.TestCase):
     def test_box_init_one_pokemon(self):
-        identifier = randint(0, 800)
+        identifier = randint(1, 800)
         pokemon = Pokemon(identifier)
         box = Box(pokemon)
         self.assertEqual(box._Box__pokemonlist[0]._Pokemon__id, identifier)
 
     def test_box_init_many_pokemon(self):
-        identifier = randint(0, 800)
+        identifier = randint(1, 800)
         pokemon = Pokemon(identifier)
-        identifier2 = randint(0, 800)
+        identifier2 = randint(1, 800)
         pokemon2 = Pokemon(identifier2)
         box = Box(pokemon, pokemon2)
         self.assertEqual(box._Box__pokemonlist[0]._Pokemon__id, identifier)
         self.assertEqual(box._Box__pokemonlist[1]._Pokemon__id, identifier2)
 
+    def test_box_team_transfer(self):
+        pokemon1 = Pokemon(randint(1, 800))
+        pokemon2 = Pokemon(randint(1, 800))
+        pokemon3 = Pokemon(randint(1, 800))
+        team = Team(pokemon1)
+        box1 = Box()
+        box2 = Box(pokemon2)
+        box2.transfer(team, 0)
+        box1.add(pokemon3)
+        team.transfer(box1, 1)
+        team.transfer(box2, 0)
+        self.assertEqual(box2._Box__pokemonlist[0], pokemon1)
+        self.assertEqual(box1._Box__pokemonlist[0], pokemon3)
+        self.assertEqual(box1._Box__pokemonlist[1], pokemon2)
+
 
 if __name__ == '__main__':
     unittest.main()