diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 985bb4ebd..000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,118 +0,0 @@
-### Changes in 2.14
-
-
-##### Global Changes
-
-1. Proper changelog added! Changes going forward will be added per patch.
-2. config.json now requires USER ID NUMBER instead of name. To get this, right click your name and click Copy ID (developer mode must be enabled in discord)
-3. Per-Server Prefixes
-Prefixes are now able to be set per-server. Default is still `!`.
-The prefix commands are limited to members with the *Manage Server* permission.
-
-`!get prefix` - This lets you see your server's current prefix.
-
-`!set prefix` - This sets the prefix for your server. Examples:
-    `!set prefix %` : This sets the server prefix to `%`
-    `!set prefix` or `!set prefix clear` : This resets the server prefix to the default.
-
-4. Added About Command
-
-The ``!about`` command will give people info on Meowth, the owner and stats such as the number of servers and members it's servicing and uptime. Optionally, one can use `!uptime` to see that stat alone.
-
-5. New Command Check Handling
-
-Commands won't show outside of usable channel's `!help` output, and won't fail silently when used in the wrong place, instead giving the user a reponse to guide them to the proper place to use it.
-
-6. Configure Bug Fix
-
-The issue where `!configure` couldn't be cancelled at the Pokemon Notification stage should now be fixed.
-
-7. Raid Report Timer Fix
-
-The issue where `!raid`, `!raidegg` timers on initial reports would accept any duration timer, even beyond 60 minutes, no matter the format, should now be fixed.
-
-8. Immortal Expired Channel Bug Fix
-
-Raid channels that recently expired may not have been picked up properly when Meowth was restarted. This should now be resolved.
-
-9. Backend has had a restructure and tidy.
-
-10. `!announce` command has been added. Use this to announce to your server. [2.14.5]
-
-11. Spruced up the `!configure` process. More to come. [2.14.6]
-
-### Changes in 2.13
-
-
-##### Global Changes
-
-1. Channel cleanup and maintenance has been fixed and Meowth should be able to delete expired channels and maintain active channels easier now.
-1. Commands are no longer case sensitive. `!raid`, `!Raid`, `!RAID`, etc. will all work.
-1. Shortcut / Command aliases have been added. `!i` for `!interested/!maybe`, `!c` for `!coming`, `!h` for `!here`. `!lists` is back and is an alias for `!list`
-1. Minor text fixes
-
-### Changes in 2.12
-
-
-##### Global Changes
-
-1. Backend has been rewritten to be more stable with the cleanup of channels and other admin/helper functions. Makes life easier for the server owner.
-1. `!duplicate` has been rewritten to be more stable and will now ask last reporter for confirmation
-1. GymHuntrBot and HuntrBot integration has been rewritten to better handle duplicates and logic on how to deal with raid eggs has been added.
-1. Time remaining in `!raid, !raidegg, !timerset` can be input as \<minutes remaining\> (15) OR \<time remaining\> (0:15)
-1. Minor text fixes
-
-##### New Commands
-
-1. `!raidegg` - Usage: `!raidegg \<level\> \<location\> \<time until hatch\>` Example: !raidegg 2 downtown 15
-  * Creates a temporary channel to coordinate for new egg spawns
-  * Use `!raid \<pokemon\>` within raid channel once egg hatches to update to an active raid channel
-  * Use `!raid assume \<pokemon\>` within raid channel to have the channel auto-update to a raid channel, currently only supported for Level 5 raid eggs
-  * Only `!maybe` will work in raid eggs, unless it is an assumed egg, to avoid people leaving if it isn’t the wanted boss
-2. `!exraid` - Usage: `!exraid \<pokemon\> \<location\>` Example: !exraid Mewtwo downtown
-  * Creates a temporary channel to coordinate for an EX Raid that lasts for three days
-3. `!invite` [Experimental]
-A totally automated way for your users to gain access to a previously reported exraid channel. Here's how it works...
-  * A user receives an EX Raid invitation.
-  * User uploads a screenshot of the invite to the Discord server, with the message `!invite` (the message and attached image must be sent together)
-  * Using dark magic developed by Google, Meowth reads the text in the image, searching for the phrase 'EX Raid Battle'
-  * If Meowth finds the keyphrase in the image, it responds to the user with a list of previously reported EX Raids and prompts the user to select the matching channel.
-  * User selects the channel and Meowth grants read and send messages permissions to that channel. If the user's raid has not been reported, they can simply type 'N' to report their own (they will have to go through the `!invite` process again.
-  * If Meowth doesn't find the keyphrase, it’ll say so. If the user sends an erroneous reply, it'll say that too. If no EX raids have been reported, it'll say that too.
-4. `!lists` has been renamed to `!list`. `!list` alone will function the same as the old `!lists` in city channels (active raid list) and in raid channels (status lists), but there is now `!list interested, !list coming, !list here` to see those specific lists. `!interest, !otw, !waiting` have been removed.
-5. `!location` - Will send raid location if sent within raid channels
-  * `!location new \<address\>` will change the raid location. Sending a Google Maps link will also correct the location as before
-
-##### Other Commands - Just for reference
-
-`!want` - A command for declaring a Pokemon species the user wants. Usage: `!want \<pokemon\>`
-
-`!unwant` - A command for removing the !want for a Pokemon. Usage: `!unwant \<pokemon\>`
-
-`!wild` - Report a wild Pokemon spawn location. Usage: `!wild \<pokemon\> \<location\>`
-
-`!raid` - Report an ongoing raid. Usage: `!raid \<pokemon\> \<location\> \<time remaining\>`
-
-`!raidegg` - Report a raid egg. Usage: `!raidegg \<level\> \<location\> \<time until hatch\>`
-
-`!exraid` - Report an upcoming EX raid. Usage: `!exraid \<pokemon\> \<location\>`
-
-`!maybe`- Indicate you are interested in the raid. Usage: `!maybe \<number of accounts *optional*\>`
-
-`!coming` - Indicate you are on the way to a raid. Usage: `!coming \<number of accounts *optional*\>`
-
-`!here` - Indicate you have arrived at the raid. Usage: `!here \<number of accounts *optional*\>`
-
-`!cancel` - Indicate you are no longer interested in a raid and clears whatever your status is. Usage: `!cancel`
-
-`!timerset` - Set the remaining duration on a raid. Usage: `!timerset \<time remaining\>`
-
-`!timer` - Have Meowth resend the expire time message for a raid. Usage: `!timer`
-
-`!starting` - Signal that a raid is starting. Usage: `!starting`
-
-`!location` - Get raid location. Usage: `!location`. Use `!location new \<address\>` to change location
-
-`!duplicate` - A command to report a raid channel as a duplicate. Usage: `!duplicate` (requires three users to remove)
-
-`!invite` - Grants access to EX Raid channels. Usage: `!invite` WITH attached invite screenshot
diff --git a/README.md b/README.md
index 20c1bdcbe..e4d7a4b64 100644
--- a/README.md
+++ b/README.md
@@ -1,125 +1,198 @@
 [![PyPI](https://img.shields.io/badge/discord.py-1.0.0a-green.svg)](https://github.com/Rapptz/discord.py/tree/rewrite/)
 [![PyPI](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-364/)
+[![PyPI](https://img.shields.io/badge/support-discord-lightgrey.svg)](https://discord.gg/hhVjAN8)
 
-# Meowth (with Huntr Integration by Doonce)
+# Meowth
 A Discord helper bot for Pokemon Go communities.
 
-Meowth is a Discord bot written in Python 3.6 using version 1.0.0a of the discord.py library.
+Meowth is a Discord bot written in Python 3.6.1+ built with [discord.py v1.0.0a (rewrite branch)](https://github.com/Rapptz/discord.py/tree/rewrite)
 
-This Huntr integrating fork is based on the original Meowth, but is not affiliated or supported by the official development team. Please to not ask for support of this ToS-violating version in the official support channels as it will not be welcomed.
+## Meowth v2 Features
 
-## Meowth 2.0 is here! Now with Category Support!
+Meowth assists with organising Pokemon Go communities with support for:
 
-1. User-driven (not automated) wild spawn and raid reporting.
-2. Role management for each Pokemon species (Discord limits a server to 250 roles, however) that allows each user to opt-in only for the Pokemon they want. These roles are mentioned when spawns or raids are reported.
-3. Raid reporting: Report either !raidegg, !raid or !exraid on the server to have meowth create channels to organise in. Certain commands can be used within raid channels, such as updating your stauts with !interested, !coming and !here. Users can easily determine the status of involved members with the !list command. Meowth also queries Google Maps to get a guess of the raid location (no access to the game means no list of gyms), or you can paste a maps link in the channel after creation to update it to exact coordinates.
-4. Optional team management and new member welcome functions.
+ - Team assignments
+ - Server greetings
+ - Wild Pokemon reporting
+ - Raid reporting and RSVP
+ - Research reporting
+ - Pokebattler integration for raid counters
+ - Silph card integration
+ - Gym matching extension for self-hosters
 
-## Directions for installing and running the bot on your server (with Huntr Integration):
+#### *`Note: All reports are provided by your active server members. Meowth does not support any TOS breaking features such as spoofing, Pokemon Go bot accounts and automated raid reporting.`*
 
-1. Install Python 3.6 and ensure PIP is also installed with it.
-https://www.python.org/downloads/release/python-364/
+# Invite Public Meowth (no hosting required)
 
-2. Install the packages needed to run meowth by running install.py:
 
-Linux:
-```bash
-python3 install.py
-```
-Windows:
-```bash
-py install.py
-```
-Tesseract-OCR has to be installed with a standard binary installer on Windows.
-Get the installer [HERE](https://github.com/tesseract-ocr/tesseract/wiki/Downloads)
-
-3. Make sure the Tesseract-OCR install folder and your python install folder are added to your system environment PATH variable.
+1. Use [THIS LINK](https://discordapp.com/oauth2/authorize?client_id=346759953006198784&scope=bot&permissions=268822608) to invite Meowth  
+1. Select your server and click Authorize
+1. Verify you aren't a robot (if the captcha doesn't appear, disable your adblocker)
+1. In your server, type `!configure`
+1. Go through the DM configuration session with Meowth to setup your server  
+   *Be sure to read the prompts carefully and join the [support server](https://discord.gg/hhVjAN8) if you get stuck*
+1. That's it! Enjoy!
 
-4. Download the files in this repository. The source code is in meowth.py and bot config is in config.json.
+#### *``Note: You must have the manage_server permission to invite a bot.``*
 
-5. Go to https://discordapp.com/developers/applications/me#top and create a new app.
+You can join the Meowth Discord Support Server for updates, setup help, feature requests, or just to test out the bot before you add it:  
+https://discord.gg/hhVjAN8
 
-6. Name it and upload the avatar of your choice.
+# Install your own Meowth
 
-7. Create a bot user for your app and reveal the bot token to copy it.
+## Dependancies
 
-8. Copy config_blank.json and rename to config.json.
+## **`Python 3.6.1+`**
 
-9. Open config.json in a text editor (a good one to use is Notepad++) and paste the bot token into the value for "bot_token", replacing the "yourtoken" string.
+[Go here](https://github.com/FoglyOgly/Meowth#installing-python) for details on how to install Python 3.6.
 
-10. Replace the "master" value in config.json with your user ID from discord.
+**For all future CLI commands, replace the command name `python3` with the relevant interpreter command name for your system (such as the common `py` command name on Windows). See details [here](https://github.com/FoglyOgly/Meowth#installing-python).**
 
-11. Go back to your Discord application page and copy the Client ID.
+## **`Discord.py v1.0.0a (Rewrite Branch)`**
 
-12. Go to the following link, replacing <CLIENT_ID> with the Client ID you copied.
-`https://discordapp.com/oauth2/authorize?client_id=<CLIENT_ID>&scope=bot&permissions=268822608`
+The [rewrite branch of discord.py](https://github.com/Rapptz/discord.py/tree/rewrite) is an in-development branch that does not yet have an official stable release, however the default/master branch is feature-frozen, and lacks support for some of the newer features in discord such as categories.
 
-13. Select the server you want to add Meowth to and complete the prompts. If you get to an empty screen and didn't get to see the Google new reCaptcha tickbox, disable your adblocker. It is important to invite Meowth to your server before proceeding.
+If you intend to fork Meowth and alter any code, ensure you keep up to date with any breaking changes that might occur in this branch of discord.py.
 
-14. Make sure you have git installed and update your discord.py file to latest version using:
-
-Linux:
 ```bash
 python3 -m pip install -U git+https://github.com/Rapptz/discord.py@rewrite
 ```
-Windows:
-```bash
-py -m pip install -U git+https://github.com/Rapptz/discord.py@rewrite
-```
 
-15. Install dependencies from the command prompt or terminal window:
+#### *``Note: You will receive the following warning on your first run, which can be disregarded:``*
+`PyNaCl is not installed, voice will NOT be supported`
 
-Linux:
+## **`Git`**
+
+To clone the files from our repository or your own forked repository on GitHub, you will need to have `git` installed.
+
+### Windows
+
+Download the [Git for Windows](https://git-scm.com/download/win) software.
+
+On install, ensure the following:
+ - `Windows Explorer integration` component (and all sub-components) is selected.
+ - `Use Git from the Windows Command Prompt` is selected in the PATH adjustment step.
+ - `Checkout as-is, commit Unix-style line endings` is selected in the line ending config step.
+ 
+ ### Linux
+
+First check if it's already installed with:
 ```bash
-python3 install.py
+git --version
 ```
-Windows:
+
+If it's not already installed, use your relevant package manager to install it.
+
+For Debian and Ubuntu, it would usually be:
 ```bash
-py install.py
+sudo apt-get install git
 ```
 
-16. Run the launcher from the command prompt or terminal window:
+## **`Required Python Packages`**
 
 Linux:
 ```bash
-python3 launcher.py -s
+python3 -m pip install "requests>=2.18.4" "hastebin.py>=0.2" "python-dateutil>=2.6.1" "fuzzywuzzy>=0.15.1" "dateparser>=0.6.0"
 ```
-Windows:
+
+## **`Optional Python Packages`**
+
+`python-Levenshtein` is an optional package that increases the speed of fuzzy matching strings, which we use for matching up pokemon names, gym names and possibly other things in future. It also removes the `Using slow pure-python SequenceMatcher` warning emitted from the `fuzzywuzzy` python package, which can otherwise be ignored.
+
 ```bash
-py launcher.py -s
+python3 -m pip install python-Levenshtein
 ```
 
-If successful, it should show "Meowth! That's right!".
+The above may not be supported on all systems. You can sometimes find a suitable wheel [here](https://www.lfd.uci.edu/~gohlke/pythonlibs/#python-levenshtein) to install with, or you may have to look around for details suitable for your specific system.
+
+## **`Meowth`**
+
+1. Create a Bot user in the [Discord Developers panel](https://discordapp.com/developers/applications/me):
+   - Click `New App`
+   - Add an App Name, Description and App Icon (which will be intial bot avatar image)
+   - Click `Create App`
+   - Click `Create a Bot User`
+   - Copy down your Client ID in the App Details box at the very top
+   - In the App Bot User box, click to reveal Token and copy it down
+   - *Optional:* Tick the Public Bot tickbox if you want to allow others to invite your bot to their own server.
+
+1. Download the files in this repository, or your own fork if you intend to modify source  
+   #### *``Note: If you alter the code significantly, adapt to support platforms we don't or integrate any TOS-breaking features, we ask you don't name your instance Meowth to avoid confusion to users between our instance and yours.``*
 
-17. The bot should have sent you DM in Discord. Add the team roles: mystic, instinct and valor. Ensure they're below the bot role in the server role hierarchy.
+1. Copy the bot config template `config_blank.json`, rename to `config.json` and edit it:
+   - `bot_token` is the Token you copied down earlier from the Discord Developers page and requires quotes as it's a string.
+   - `default_prefix` is the prefix the bot will use by default until a guild specifies otherwise with the `set prefix` command
+   - `master` is your personal discord account ID. This should be a long set of numbers like `174764205927432192` and should not have quotes around it, as it's an `int` not a string.
+     * You can get your ID by enabling Developer Mode on the Discord Client, in `User Settings` > `Appearance` > `Advanced`, which then enables you to right-click your username in chat and select the option `Copy ID`
+     * Another method is to mention yourself in chat and add `\` directly behind the mention for it to escape the mention string that's created, revealing your ID.
+   - `type_id_dict` specifies what Pokemon Type emojis to use for your bot.  
+      - By default, it assumes you have the emojis in your own discord guild, and doesn't use the specific external emoji format.  If you intend to allow the bot on multiple guilds, you will want to setup the external emoji strings.
 
-18. Simply type !configure in your server to start the configuration process.
+1. Invite your Bot's User to your guild:
+   - Get the Client ID you copied earlier from the Discord Developers page and replace the text `<CLIENT_ID>` with it in the following URL:  
+   `https://discordapp.com/oauth2/authorize?client_id=<CLIENT_ID>&scope=bot&permissions=268822608`
+   - Go to the URL, select your server and click `Authorize`
+   - Verify you aren't a robot (if the captcha doesn't appear, disable your adblocker)
+  
 
-### Launcher Reference:
-Arguments:
+
+1. Run the launcher from the command prompt or terminal window:  
+   `python3 launcher.py`
+
+   If successful, it should send "Meowth! That's right!" as well as basic info on startup.
+
+1. Simply type `!configure` in your server to start the configuration process as normal.
+
+## Launcher Reference:
+### Arguments
 ```
-  --help, -h          Show the help message
-  --start, -s         Starts Meowth
-  --auto-restart, -r  Auto-Restarts Meowth in case of a crash.
-  --debug, -d         Prevents output being sent to Discord DM, as restarting
-                      could occur often.
+  --help, -h           Show the help message
+  --auto-restart, -r   Auto-Restarts Meowth in case of a crash.
+  --debug, -d          Prevents output being sent to Discord DM, as restarting
+                       could occur often.
 ```
 
-Launch Meowth normally:
+### Launch Meowth normally
 ```bash
-python3 launcher.py -s
+python3 launcher.py
 ```
 
-Launch Meowth in debug mode if working on code changes:
+### Launch Meowth in debug mode if working on code changes
 ```bash
-python3 launcher.py -s -d
+python3 launcher.py -d
 ```
 
-Launch Meowth with Auto-Restart:
+### Launch Meowth with Auto-Restart
 ```bash
-python3 launcher.py -s -r
+python3 launcher.py -r
 ```
 
+## How to Translate Meowth:
+
+We currently only support English with our public bot, with self-hosting being the only way to support other languages.
+
+However, we have quite a few people [on our support server](https://discord.gg/hhVjAN8) who have been working on their own translations in a variety of languages.
+
+If you are wanting to translate Meowth to your language, check there in our `#non-english-support` channel to see if someone might be able to share what they've worked on in the language you need.
+
+To translate Meowth yourself, you can use pygettext.py and edit the generated translation files using [Poedit](https://poedit.net/). 
+
+To generate a .pot file in Windows for example:
+
+1. Nativate to `[pythonpath]\Python36\Tools\i18n\`
+
+1. Open Command Prompt or PowerShell in this directory and run:
+
+   `py pygettext.py -d <RESULTING FILENAME> <PATH TO SPECIFIC *.PY FILE>`
+
+1. This will generate a meowth.pot that you can then translate using Poedit
+
+1. Place the po/mo files from poedit into the `/locale/<language abbreviation>/LC_MESSAGES` directory (use other languages for reference)
+
+1. Change Meowth's config.json `bot-language` and `pokemon-language` to `<language abbreviation>`
+
+#### *``Note: Since moving to Python 3.6 we have utlised f-strings in our source code in order to take advantage of the cleanliness and additional performance it brings. Unfortunately, we have later found out it is incompatible with pygettext's string extraction and replacement methods. As such, any strings that require translating that use f-strings will need to be edited in source to use str.format() instead.``*
+
 ## Directions for using Meowth:
 Note: Avoid punctuation inside commands.
 
@@ -138,6 +211,8 @@ pkmn = Pokemon
 | **!welcome** \[@member\] | *Owner Only* | Sends the welcome message to either user or mentioned member. |
 | **!outputlog**  | *Server Manager Only* | Uploads the log file to hastebin and replies with the link. |
 | **!set prefix** \[prefix\] | *Server Manager Only* | Sets Meowth's prefix. |
+| **!set regional** \<pkmn\> | *Server Manager Only* | Sets server's regional raid boss. Accepts number or name. |
+| **!set timezone** \<UTC offset\> | *Server Manager Only* | Sets server's timezone. Accepts numbers from -12 to 14. |
 | **!get prefix** | *Server Manager Only* | Displays Meowth's prefix. |
 | **!get perms** \[channelid\] | *Server Manager Only* | Displays Meowth's permissions in guild and channel. |
 | **!welcome** \[user\] | *Owner Only* | Test welcome message on mentioned member |
@@ -148,7 +223,7 @@ pkmn = Pokemon
 | **!clearstatus**  | *Channel Manager<br/>Raid Channel* | Cancel everyone's status. |
 | **!setstatus** \<user\> \<status\> \[count\] | *Channel Manager<br/>Raid Channel* | Changes raid channel status lists. |
 | **!cleanroles** | *Channel Manager* | Removes all 0 member pokemon roles. |
-| **!archive** | *Messages Manager<br/>Raid Channel* | Mark a channel for archiving. |
+| **!reset_board** \[user\] \[type\] | *Server Manager* | Resets \[user\]'s or server's leaderboard by type or total. |
 
 ### Miscellaneous Commands
 | Commands | Requirements  | Description |
@@ -157,6 +232,10 @@ pkmn = Pokemon
 | **!about** | - | Shows info about Meowth. |
 | **!uptime** | - | Shows Meowth's uptime. |
 | **!team** \<team\> | - | Let's users set their team role. |
+| **!set silph** \<Silph name\> | - | Links user\'s Silph Road account to Meowth. |
+| **!silphcard** \[Silph name\] | - | Displays [Silph name]\'s or user\'s trainer card. |
+| **!profile** \[username\] | - | Displays [username]\'s or user\'s profile. |
+| **!leaderboard** \[type\] | - | Displays reporting leaderboard. Accepts total, raids, eggs, exraids, wilds, research. Defaults to total. |
 
 ### Pokemon Notification Commands:
 
@@ -170,14 +249,14 @@ pkmn = Pokemon
 
 | Commands | Requirements  | Description |
 | -------- |:-------------:| ------------|
-| **!wild** \<pkmn\> \<location\> | *Region Channel* | Reports a wild pokemon, notifying people who want it. |
-| **!raid** \<pkmn\> \<place\> \[timer\] | *Region Channel* | Creates an open raid channel. |
-| **!raidegg** \<level\> \<place\> \[timer\] | *Region Channel* | Creates a raid egg channel. |
+| **!wild** \<pkmn\> \<location\> | *Region Channel* | Reports a wild pokemon, notifying people who want it. `Aliases: !w` |
+| **!raid** \<pkmn\> \<place\> \[timer\] | *Region Channel* | Creates an open raid channel. `Aliases: !r`|
+| **!raidegg** \<level\> \<place\> \[timer\] | *Region Channel* | Creates a raid egg channel. `Aliases: !re, !regg, !egg` |
 | **!raid** \<pkmn\> | *Raid Egg Channel* | Converts raid egg to an open raid. |
 | **!raid assume** \<pkmn\> | *Raid Egg Channel* | Assumes a pokemon on hatch. |
-| **!exraid** \<pkmn\> \<place\> | *Region Channel* | Creates an exraid channel. |
+| **!exraid** \<pkmn\> \<place\> | *Region Channel* | Creates an exraid channel. `Aliases: !ex`|
 | **!invite**  | *Region Channel* | Gain entry to exraids. |
-
+| **!research** \[pokestop name \[optional URL\], quest, reward\] | *Region Channel* | Reports field research. Guided version available with just **!research** `Aliases: !res` |
 
 ### Raid Channel Management:
 
@@ -185,32 +264,33 @@ pkmn = Pokemon
 | -------- |:-------------:| ------------|
 | **!timer** | *Raid Channel* | Shows the expiry time for the raid. |
 | **!timerset** \<timer\> | *Raid Channel* | Set the expiry time for the raid. |
-| **!starttime** \[HH:MM AM/PM\] | *Raid Channel* | Reports the raid as a duplicate channel. |
+| **!starttime** \[HH:MM AM/PM\] | *Raid Channel* | Set a time for a group to start a raid. |
 | **!location** | *Raid Channel* | Shows the raid location. |
 | **!location new** \<place/map\> | *Raid Channel* | Sets the raid location. |
 | **!recover** | *Raid Channel* | Recovers an unresponsive raid channel. |
 | **!duplicate** | *Raid Channel* | Reports the raid as a duplicate channel. |
 | **!weather** | *Raid Channel* | Sets the weather for the raid. |
 | **!counters** | *Raid Channel* | Simulate a Raid battle with Pokebattler. |
+| **!archive** | *Raid Channel* | Mark a channel for archiving. |
 
 ### Status Management:
 
 | Commands | Requirements  | Description |
 | -------- |:-------------:| ------------|
-| **!interested** \[number\] \[teamcounts\] \[boss list or all\] | *Raid Channel* | Sets your status for the raid to 'interested'. Teamcounts format is `m# v# i#`. You can also supply a list of bosses or 'all' that you are interested in. |
-| **!coming** \[number\] \[teamcounts\] \[boss list or all\] | *Raid Channel* | Sets your status for the raid to 'coming'.  Teamcounts format is `m# v# i#`. You can also supply a list of bosses or 'all' that you are interested in. |
-| **!here** \[number\] \[teamcounts\] \[boss list or all\] | *Raid Channel* | Sets your status for the raid to 'here'.  Teamcounts format is `m# v# i#`. You can also supply a list of bosses or 'all' that you are interested in. |
-| **!lobby** \[number\] | *Raid Channel* | Indicate you are entering the raid lobby. |
-| **!starting** | *Raid Channel* | Clears all members 'here', announce raid start. |
+| **!interested** \[number\] \[teamcounts\] \[boss list or all\] | *Raid Channel* | Sets your status for the raid to 'interested'. Teamcounts format is `m# v# i# u#`. You can also supply a list of bosses or 'all' that you are interested in. `Aliases: !i, !maybe` |
+| **!coming** \[number\] \[teamcounts\] \[boss list or all\] | *Raid Channel* | Sets your status for the raid to 'coming'.  Teamcounts format is `m# v# i# u#`. You can also supply a list of bosses or 'all' that you are interested in. `Aliases: !c` |
+| **!here** \[number\] \[teamcounts\] \[boss list or all\] | *Raid Channel* | Sets your status for the raid to 'here'.  Teamcounts format is `m# v# i# u#`. You can also supply a list of bosses or 'all' that you are interested in. `Aliases: !h` |
+| **!lobby** \[number\] | *Raid Channel* | Indicate you are entering the raid lobby. `Aliases: !l` |
+| **!starting** \[team\] | *Raid Channel* | Clears all members 'here', announce raid start. |
 | **!backout** | *Raid Channel* | Request players in lobby to backout. |
-| **!cancel**  | *Raid Channel* | Cancel your status. |
+| **!cancel**  | *Raid Channel* | Cancel your status. `Aliases: !x` |
 
 ### List Commands:
 
 | Commands | Requirements  | Description |
 | -------- |:-------------:| ------------|
-| **!list** | *Region Channel* | Lists all raids from that region channel. |
-| **!list**  | *Raid Channel* | Lists all member status' for the raid. |
+| **!list** | *Region Channel* | Lists all raids from that region channel. `Aliases: !lists`|
+| **!list**  | *Raid Channel* | Lists all member status' for the raid. `Aliases: !lists`|
 | **!list tags** | *Raid Channel* | Same behavior as !list, but with @mentions. |
 | **!list interested** | *Raid Channel* | Lists 'interested' members for the raid. |
 | **!list coming**  | *Raid Channel* | Lists 'coming' members for the raid. |
@@ -220,8 +300,11 @@ pkmn = Pokemon
 | **!list mystic** | *Raid Channel* | Lists teams of mystic members that have RSVPd. |
 | **!list valor** | *Raid Channel* | Lists teams of valor members that have RSVPd. |
 | **!list instinct** | *Raid Channel* | Lists teams of instinct members that have RSVPd. |
+| **!list unknown** | *Raid Channel* | Lists members with unknown team that have RSVPd. |
 | **!list bosses** | *Raid Channel* | Lists boss interest of members that have RSVPd. |
 | **!list wants** | *Want Channel* | List the wants for the user. |
+| **!list wilds** | *Region Channel* | List the wilds for the channel. |
+| **!list research** | *Region Channel* | List the research for the channel. |
 
 ## General notes on Meowth:
 
@@ -232,3 +315,53 @@ If you are having trouble getting Meowth running in your server, we have found t
 ## Known issues:
 
 Compatibility with Python 3.6 on Mac OS X requires running "Install Certificates.command" in the Python 3.6 folder.
+
+# Installing Python
+
+## Windows
+
+Install the latest Python 3.6 package from the official site if you have not already got it. At the time of writing, Python 3.6.5 was the latest maintenance release.  
+https://www.python.org/downloads/release/python-365/
+
+Python must be added the the environment's PATH, which is typically done automatically on install.
+
+Your newly installed Python interpreter can be run in CLI in either Command Prompt or PowerShell typically with one of the following commands:
+
+> `python`  
+> `py`  
+> `py -3`  
+> `py -3.6`
+
+To check your referenced interpreter version, use:
+```bash
+python --version
+```
+
+Be sure to replace all instructions that specify a certain interpreter command with the one relevant to your system, as this differs between each individual OS, configuration and environment.
+
+#### Linux
+
+If you're using Linux, you will likely have a version of Python 3 already installed on your system. Check your current version with:
+```bash
+python3 --version
+```
+
+If the version is not `3.6.1` or above, or `python3` is not found, you will need to install it on your system. You do not need to remove any existing versions from your system and it is usually not recommended to uninstal the default package as other system packages may rely on it.
+
+**There are a large variety of flavours of linux, so be sure to reference online guides on how to install the required Python version with your specific system and package manager.**
+
+If you're on a version of Debian or Ubuntu and there is not a suitable ready-made package to install, the following is how to build and install Python 3.6.5 tailored for your specific system:
+```bash
+sudo apt-get update &&
+sudo apt-get install ca-certificates libexpat1 libffi6 libgdbm3 libreadline7 libsqlite3-0 libssl1.1 dpkg-dev gcc libbz2-dev libc6-dev libexpat1-dev libffi-dev libgdbm-dev liblzma-dev libncursesw5-dev libreadline-dev libsqlite3-dev libssl-dev make tcl-dev tk-dev wget xz-utils zlib1g-dev gnupg dirmngr
+wget https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz
+wget https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz.asc
+gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
+gpg --batch --verify Python-3.6.5.tar.xz.asc Python-3.6.5.tar.xz
+tar -xf Python-3.6.5.tar.xz
+cd Python-3.6.5
+./configure --enable-optimizations --enable-loadable-sqlite-extensions --enable-shared --with-system-expat --with-system-ffi
+sudo make -j "$(nproc)"
+sudo make altinstall
+```
+#### *``Credits to Devon from the discord.py support server for testing and providing the above script.``*
diff --git a/config_blank.json b/config_blank.json
index 176d88db9..11bc22eca 100644
--- a/config_blank.json
+++ b/config_blank.json
@@ -18,10 +18,10 @@
 
 "//": "Define Meowth's master id (that's you).",
 "//": "Meowth will only take admin commands from the user with this id",
-"master": 10000000000000000,
+"master": 000000000000000000,
 
 "//": "Limit egg assumed hatches to certain egg levels.",
-"allow_assume": {"EX": "True", "5": "True", "4": "False", "3": "False", "2": "False", "1": "False"},
+"allow_assume": {"EX": "False", "5": "False", "4": "False", "3": "False", "2": "False", "1": "False"},
 
 "//": "Define your server's emoji strings here.",
 
@@ -54,5 +54,4 @@
     "fairy"    : ":fairy:"
 }
 
-
 }
diff --git a/data/gym_data_example.json b/data/gym_data_example.json
new file mode 100644
index 000000000..472ebab4e
--- /dev/null
+++ b/data/gym_data_example.json
@@ -0,0 +1,18 @@
+{
+    "344960572649111552":{
+        "gym_name_to_match_with":
+        {
+            "coordinates": "-33.877055, 151.207662",
+            "notes": "these are notes about gym_name_to_match_with"
+        },
+        "another_gym":
+        {
+            "coordinates": "-33.876516, 151.203160"
+        },
+        "last_gym_sample":
+        {
+            "coordinates": "-33.875804, 151.210955",
+            "notes": "these are notes about last_gym_sample"
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/raid_info.json b/data/raid_info.json
index 92172ed8e..3bb7c6e81 100644
--- a/data/raid_info.json
+++ b/data/raid_info.json
@@ -1,47 +1,71 @@
-
 {
-    "raid_eggs": {
-        "1": {
-            "egg": "normal",
-            "egg_img": "1.png",
-            "pokemon": [129,320,333,361],
-            "hatchtime":60,
-            "raidtime":45
-        },
-        "2": {
-            "egg": "normal",
-            "egg_img": "2.png",
-            "pokemon": [87,91,302,303],
-            "hatchtime":60,
-            "raidtime":45
-        },
-        "3": {
-            "egg": "rare",
-            "egg_img": "3.png",
-            "pokemon": [68,124,184,221],
-            "hatchtime":60,
-            "raidtime":45
-        },
-        "4": {
-            "egg": "rare",
-            "egg_img": "4.png",
-            "pokemon": [131,160,248,306,359],
-            "hatchtime":60,
-            "raidtime":45
-        },
-        "5": {
-            "egg": "legendary",
-            "egg_img": "5.png",
-            "pokemon": [384],
-            "hatchtime":60,
-            "raidtime":45
-        },
-        "EX": {
-            "egg": "EX",
-            "egg_img": "EX.png",
-            "pokemon": [150],
-            "hatchtime":14,
-            "raidtime":45
-        }
+  "raid_eggs": {
+    "1": {
+      "egg": "normal", 
+      "egg_img": "1.png", 
+      "pokemon": [
+        129, 
+        138, 
+        140, 
+        320
+      ], 
+      "hatchtime": 60, 
+      "raidtime": 45
+    }, 
+    "2": {
+      "egg": "normal", 
+      "egg_img": "2.png", 
+      "pokemon": [
+        125, 
+        185, 
+        303, 
+        310
+      ], 
+      "hatchtime": 60, 
+      "raidtime": 45
+    }, 
+    "3": {
+      "egg": "rare", 
+      "egg_img": "3.png", 
+      "pokemon": [
+        68, 
+        95, 
+        135, 
+        142
+      ], 
+      "hatchtime": 60, 
+      "raidtime": 45
+    }, 
+    "4": {
+      "egg": "rare", 
+      "egg_img": "4.png", 
+      "pokemon": [
+        76, 
+        112, 
+        248, 
+        359
+      ], 
+      "hatchtime": 60, 
+      "raidtime": 45
+    }, 
+    "5": {
+      "egg": "legendary", 
+      "egg_img": "5.png", 
+      "pokemon": [
+        378, 
+        379
+      ], 
+      "hatchtime": 60, 
+      "raidtime": 45
+    }, 
+    "EX": {
+      "egg": "EX", 
+      "egg_img": "EX.png", 
+      "pokemon": [
+        150
+      ], 
+      "hatchtime": 14, 
+      "raidtime": 45
     }
-}
+  }
+}
\ No newline at end of file
diff --git a/data/serverdict_converter.py b/data/serverdict_converter.py
index 905449eff..619fe53f1 100644
--- a/data/serverdict_converter.py
+++ b/data/serverdict_converter.py
@@ -3,60 +3,132 @@
 import discord
 import tempfile
 import json
+import copy
+
 
-server_dict_new = {}
 
 with open('serverdict', "rb") as fd:
-	server_dict_old = pickle.load(fd)
+	guild_dict_convert = pickle.load(fd)
+
 
-for server in server_dict_old:
-	server_dict_new[server.id] = {}
-	for key in server_dict_old[server]:
-		try:
-			server_dict_new[server.id][key] = server_dict_old[server][key]
-		except:
-			pass
-	server_dict_new[server.id]['raidchannel_dict'] = {}
-	server_dict_new[server.id]['want_channel_list']= []
-	for channel in server_dict_old[server]['want_channel_list']:
-		server_dict_new[server.id]['want_channel_list'].append(channel.id)
+for guild in guild_dict_convert:
+    configure_dict = copy.deepcopy(guild_dict_convert[guild].get('configure_dict',{}))
+    configure_dict['welcome'] = {
+        "enabled":guild_dict_convert[guild].get('welcome',False),
+        "welcomechan":guild_dict_convert[guild].get('welcomechan',''),
+        "welcomemsg":guild_dict_convert[guild].get('welcomemsg','default')
+    }
+    configure_dict['want'] = {
+        "enabled":guild_dict_convert[guild].get('wantset',False),
+        "report_channels": guild_dict_convert[guild].get('want_channel_list',[])
+    }
+    configure_dict['raid'] = {
+        "enabled":guild_dict_convert[guild].get('raidset',False),
+        'report_channels': guild_dict_convert[guild].get('city_channels',{}),
+        "categories":guild_dict_convert[guild].get('categories',None),
+        "category_dict":guild_dict_convert[guild].get('category_dict',{})
+    }
+    configure_dict['exraid'] = {
+        "enabled":guild_dict_convert[guild].get('raidset',False),
+        'report_channels': guild_dict_convert[guild].get('city_channels',{}),
+        "categories":guild_dict_convert[guild].get('categories',None),
+        "category_dict":guild_dict_convert[guild].get('category_dict',{}),
+        "permissions":"everyone"
+    }
+    configure_dict['wild'] = {
+        "enabled":guild_dict_convert[guild].get('wildset',False),
+        'report_channels': guild_dict_convert[guild].get('city_channels',{}),
+    }
+    configure_dict['counters'] = {
+       "enabled":True,
+       'auto_levels': ["3","4","5"],
+    }
+    configure_dict['research'] = {
+        "enabled":True,
+        'report_channels': guild_dict_convert[guild].get('city_channels',{}),
+    }
+    configure_dict['archive'] = {
+        "enabled":True,
+        "category":guild_dict_convert[guild].get('archive',{}).get('category','same'),
+        'list':guild_dict_convert[guild].get('archive',{}).get('list',[])
+    }
+    configure_dict['invite'] = {
+        "enabled":True
+    }
+    configure_dict['team'] = {
+        "enabled":guild_dict_convert[guild].get('team',False)
+    }
+    configure_dict['settings'] = {
+        "offset":guild_dict_convert[guild].get('offset',0),
+        "regional":guild_dict_convert[guild].get('regional',None),
+        "prefix":guild_dict_convert[guild].get('prefix',None),
+        "done":guild_dict_convert[guild].get('done',False),
+        "config_sessions": {}
+    }
+    guild_dict_convert[guild]['configure_dict'] = configure_dict
+    try:
+        del guild_dict_convert[guild]['want_channel_list']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['welcomemsg']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['city_channels']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['categories']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['category_dict']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['offset']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['welcome']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['welcomechan']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['wantset']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['raidset']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['wildset']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['team']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['want']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['other']
+    except:
+        pass
+    try:
+        del guild_dict_convert[guild]['done']
+    except:
+        pass
 
-	for channel in server_dict_old[server]['raidchannel_dict']:
-		server_dict_new[server.id]['raidchannel_dict'][channel.id] = {
-			'address': server_dict_old[server]['raidchannel_dict'][channel]['address'],
-			'reportcity': server_dict_old[server]['raidchannel_dict'][channel]['reportcity'],
-			'trainer_dict' : server_dict_old[server]['raidchannel_dict'][channel]['trainer_dict'],
-			'exp': server_dict_old[server]['raidchannel_dict'][channel]['exp'],
-			'manual_timer' : server_dict_old[server]['raidchannel_dict'][channel]['manual_timer'],
-			'active': server_dict_old[server]['raidchannel_dict'][channel]['active'],
-			'raidmessage': server_dict_old[server]['raidchannel_dict'][channel]['raidmessage'].id,
-			'raidreport': server_dict_old[server]['raidchannel_dict'][channel]['raidreport'].id,
-			'type': server_dict_old[server]['raidchannel_dict'][channel]['type'],
-			'pokemon': server_dict_old[server]['raidchannel_dict'][channel]['pokemon'],
-			'egglevel': server_dict_old[server]['raidchannel_dict'][channel]['egglevel']
-			}
 
 with tempfile.NamedTemporaryFile('wb', delete=False) as tf:
-	pickle.dump(server_dict_new, tf)
+	pickle.dump(guild_dict_convert, tf)
 	tempname = tf.name
 os.rename(tempname, 'serverdict_converted')
-
-servercount_old = 0
-raidchannelcount_old = 0
-servercount_new = 0
-raidchannelcount_new = 0
-
-for server in server_dict_old:
-	servercount_old += 1
-	for channel in server_dict_old[server]['raidchannel_dict']:
-		raidchannelcount_old += 1
-
-for server in server_dict_new:
-	servercount_new += 1
-	for channel in server_dict_new[server]['raidchannel_dict']:
-		raidchannelcount_new += 1
-
-print("Old server count: {}".format(str(servercount_old)))
-print("New server count: {}".format(str(servercount_new)))
-print("Old raid count: {}".format(str(raidchannelcount_old)))
-print("New raid count: {}".format(str(raidchannelcount_new)))
diff --git a/images/misc/trade_icon_small.png b/images/misc/trade_icon_small.png
new file mode 100644
index 000000000..ef2094f97
Binary files /dev/null and b/images/misc/trade_icon_small.png differ
diff --git a/images/pkmn/000.png b/images/pkmn/000.png
new file mode 100644
index 000000000..93a913656
Binary files /dev/null and b/images/pkmn/000.png differ
diff --git a/images/pkmn/001_s.png b/images/pkmn/001_s.png
new file mode 100644
index 000000000..834f702b6
Binary files /dev/null and b/images/pkmn/001_s.png differ
diff --git a/images/pkmn/002_s.png b/images/pkmn/002_s.png
new file mode 100644
index 000000000..750d0852f
Binary files /dev/null and b/images/pkmn/002_s.png differ
diff --git a/images/pkmn/003_s.png b/images/pkmn/003_s.png
new file mode 100644
index 000000000..652343009
Binary files /dev/null and b/images/pkmn/003_s.png differ
diff --git a/images/pkmn/004_s.png b/images/pkmn/004_s.png
new file mode 100644
index 000000000..072679800
Binary files /dev/null and b/images/pkmn/004_s.png differ
diff --git a/images/pkmn/005_s.png b/images/pkmn/005_s.png
new file mode 100644
index 000000000..cbef06f72
Binary files /dev/null and b/images/pkmn/005_s.png differ
diff --git a/images/pkmn/006_s.png b/images/pkmn/006_s.png
new file mode 100644
index 000000000..96cd0b1df
Binary files /dev/null and b/images/pkmn/006_s.png differ
diff --git a/images/pkmn/007_s.png b/images/pkmn/007_s.png
new file mode 100644
index 000000000..23bc1a91c
Binary files /dev/null and b/images/pkmn/007_s.png differ
diff --git a/images/pkmn/007sunglasses_.png b/images/pkmn/007sunglasses_.png
new file mode 100644
index 000000000..e17d721bf
Binary files /dev/null and b/images/pkmn/007sunglasses_.png differ
diff --git a/images/pkmn/007sunglasses_s.png b/images/pkmn/007sunglasses_s.png
new file mode 100644
index 000000000..aa04d9896
Binary files /dev/null and b/images/pkmn/007sunglasses_s.png differ
diff --git a/images/pkmn/008_s.png b/images/pkmn/008_s.png
new file mode 100644
index 000000000..3947d750d
Binary files /dev/null and b/images/pkmn/008_s.png differ
diff --git a/images/pkmn/008sunglasses_.png b/images/pkmn/008sunglasses_.png
new file mode 100644
index 000000000..046d6c65a
Binary files /dev/null and b/images/pkmn/008sunglasses_.png differ
diff --git a/images/pkmn/008sunglasses_s.png b/images/pkmn/008sunglasses_s.png
new file mode 100644
index 000000000..131dc63d7
Binary files /dev/null and b/images/pkmn/008sunglasses_s.png differ
diff --git a/images/pkmn/009_s.png b/images/pkmn/009_s.png
new file mode 100644
index 000000000..7debf2393
Binary files /dev/null and b/images/pkmn/009_s.png differ
diff --git a/images/pkmn/009sunglasses_.png b/images/pkmn/009sunglasses_.png
new file mode 100644
index 000000000..2c74f48f5
Binary files /dev/null and b/images/pkmn/009sunglasses_.png differ
diff --git a/images/pkmn/009sunglasses_s.png b/images/pkmn/009sunglasses_s.png
new file mode 100644
index 000000000..d0f35be8d
Binary files /dev/null and b/images/pkmn/009sunglasses_s.png differ
diff --git a/images/pkmn/010_s.png b/images/pkmn/010_s.png
new file mode 100644
index 000000000..bb6c23d1b
Binary files /dev/null and b/images/pkmn/010_s.png differ
diff --git a/images/pkmn/011_s.png b/images/pkmn/011_s.png
new file mode 100644
index 000000000..2a3119de3
Binary files /dev/null and b/images/pkmn/011_s.png differ
diff --git a/images/pkmn/012_s.png b/images/pkmn/012_s.png
new file mode 100644
index 000000000..4390f2456
Binary files /dev/null and b/images/pkmn/012_s.png differ
diff --git a/images/pkmn/013_s.png b/images/pkmn/013_s.png
new file mode 100644
index 000000000..282bb73f7
Binary files /dev/null and b/images/pkmn/013_s.png differ
diff --git a/images/pkmn/014_s.png b/images/pkmn/014_s.png
new file mode 100644
index 000000000..0d0dda5f6
Binary files /dev/null and b/images/pkmn/014_s.png differ
diff --git a/images/pkmn/016_s.png b/images/pkmn/016_s.png
new file mode 100644
index 000000000..819764afa
Binary files /dev/null and b/images/pkmn/016_s.png differ
diff --git a/images/pkmn/018_s.png b/images/pkmn/018_s.png
new file mode 100644
index 000000000..3fc32c9a8
Binary files /dev/null and b/images/pkmn/018_s.png differ
diff --git a/images/pkmn/019_a.png b/images/pkmn/019_a.png
new file mode 100644
index 000000000..5f7dc58dd
Binary files /dev/null and b/images/pkmn/019_a.png differ
diff --git a/images/pkmn/019_as.png b/images/pkmn/019_as.png
new file mode 100644
index 000000000..1e3c38cc1
Binary files /dev/null and b/images/pkmn/019_as.png differ
diff --git a/images/pkmn/019_s.png b/images/pkmn/019_s.png
new file mode 100644
index 000000000..84b20f389
Binary files /dev/null and b/images/pkmn/019_s.png differ
diff --git a/images/pkmn/020_a.png b/images/pkmn/020_a.png
new file mode 100644
index 000000000..a8aa602b3
Binary files /dev/null and b/images/pkmn/020_a.png differ
diff --git a/images/pkmn/020_as.png b/images/pkmn/020_as.png
new file mode 100644
index 000000000..a2c66f93c
Binary files /dev/null and b/images/pkmn/020_as.png differ
diff --git a/images/pkmn/020_s.png b/images/pkmn/020_s.png
new file mode 100644
index 000000000..bf0037198
Binary files /dev/null and b/images/pkmn/020_s.png differ
diff --git a/images/pkmn/021_s.png b/images/pkmn/021_s.png
new file mode 100644
index 000000000..ffdd20d3e
Binary files /dev/null and b/images/pkmn/021_s.png differ
diff --git a/images/pkmn/022_s.png b/images/pkmn/022_s.png
new file mode 100644
index 000000000..473849396
Binary files /dev/null and b/images/pkmn/022_s.png differ
diff --git a/images/pkmn/023_s.png b/images/pkmn/023_s.png
new file mode 100644
index 000000000..3e3b1599b
Binary files /dev/null and b/images/pkmn/023_s.png differ
diff --git a/images/pkmn/024_s.png b/images/pkmn/024_s.png
new file mode 100644
index 000000000..b5b312d0b
Binary files /dev/null and b/images/pkmn/024_s.png differ
diff --git a/images/pkmn/025_s.png b/images/pkmn/025_s.png
new file mode 100644
index 000000000..231554b6d
Binary files /dev/null and b/images/pkmn/025_s.png differ
diff --git a/images/pkmn/025ash_.png b/images/pkmn/025ash_.png
new file mode 100644
index 000000000..e8ecfe2dd
Binary files /dev/null and b/images/pkmn/025ash_.png differ
diff --git a/images/pkmn/025ash_s.png b/images/pkmn/025ash_s.png
new file mode 100644
index 000000000..2f7a0dc43
Binary files /dev/null and b/images/pkmn/025ash_s.png differ
diff --git a/images/pkmn/025party_.png b/images/pkmn/025party_.png
new file mode 100644
index 000000000..825792b26
Binary files /dev/null and b/images/pkmn/025party_.png differ
diff --git a/images/pkmn/025party_s.png b/images/pkmn/025party_s.png
new file mode 100644
index 000000000..b1b83e934
Binary files /dev/null and b/images/pkmn/025party_s.png differ
diff --git a/images/pkmn/025santa_.png b/images/pkmn/025santa_.png
new file mode 100644
index 000000000..d397a17d6
Binary files /dev/null and b/images/pkmn/025santa_.png differ
diff --git a/images/pkmn/025santa_s.png b/images/pkmn/025santa_s.png
new file mode 100644
index 000000000..a97eb6027
Binary files /dev/null and b/images/pkmn/025santa_s.png differ
diff --git a/images/pkmn/025santas.png b/images/pkmn/025santas.png
new file mode 100644
index 000000000..7ff8f0f78
Binary files /dev/null and b/images/pkmn/025santas.png differ
diff --git a/images/pkmn/025summer_.png b/images/pkmn/025summer_.png
new file mode 100644
index 000000000..6aea82564
Binary files /dev/null and b/images/pkmn/025summer_.png differ
diff --git a/images/pkmn/025summer_s.png b/images/pkmn/025summer_s.png
new file mode 100644
index 000000000..217f894d3
Binary files /dev/null and b/images/pkmn/025summer_s.png differ
diff --git a/images/pkmn/025witch_.png b/images/pkmn/025witch_.png
new file mode 100644
index 000000000..172b7f2d6
Binary files /dev/null and b/images/pkmn/025witch_.png differ
diff --git a/images/pkmn/025witch_s.png b/images/pkmn/025witch_s.png
new file mode 100644
index 000000000..13fe8a52b
Binary files /dev/null and b/images/pkmn/025witch_s.png differ
diff --git a/images/pkmn/026_a.png b/images/pkmn/026_a.png
new file mode 100644
index 000000000..5608b4c70
Binary files /dev/null and b/images/pkmn/026_a.png differ
diff --git a/images/pkmn/026_as.png b/images/pkmn/026_as.png
new file mode 100644
index 000000000..d68a172bc
Binary files /dev/null and b/images/pkmn/026_as.png differ
diff --git a/images/pkmn/026_s.png b/images/pkmn/026_s.png
new file mode 100644
index 000000000..964aa9d1a
Binary files /dev/null and b/images/pkmn/026_s.png differ
diff --git a/images/pkmn/026ash_.png b/images/pkmn/026ash_.png
new file mode 100644
index 000000000..f33b9cfc6
Binary files /dev/null and b/images/pkmn/026ash_.png differ
diff --git a/images/pkmn/026ash_s.png b/images/pkmn/026ash_s.png
new file mode 100644
index 000000000..3c55d1834
Binary files /dev/null and b/images/pkmn/026ash_s.png differ
diff --git a/images/pkmn/026party_.png b/images/pkmn/026party_.png
new file mode 100644
index 000000000..20a3f06f8
Binary files /dev/null and b/images/pkmn/026party_.png differ
diff --git a/images/pkmn/026party_s.png b/images/pkmn/026party_s.png
new file mode 100644
index 000000000..6eba916f5
Binary files /dev/null and b/images/pkmn/026party_s.png differ
diff --git a/images/pkmn/026santa_.png b/images/pkmn/026santa_.png
new file mode 100644
index 000000000..19bb99389
Binary files /dev/null and b/images/pkmn/026santa_.png differ
diff --git a/images/pkmn/026santa_s.png b/images/pkmn/026santa_s.png
new file mode 100644
index 000000000..10b8a5356
Binary files /dev/null and b/images/pkmn/026santa_s.png differ
diff --git a/images/pkmn/026santas.png b/images/pkmn/026santas.png
new file mode 100644
index 000000000..49bfbb548
Binary files /dev/null and b/images/pkmn/026santas.png differ
diff --git a/images/pkmn/026summer_.png b/images/pkmn/026summer_.png
new file mode 100644
index 000000000..b8815ca48
Binary files /dev/null and b/images/pkmn/026summer_.png differ
diff --git a/images/pkmn/026summer_s.png b/images/pkmn/026summer_s.png
new file mode 100644
index 000000000..02daba0a3
Binary files /dev/null and b/images/pkmn/026summer_s.png differ
diff --git a/images/pkmn/026witch_.png b/images/pkmn/026witch_.png
new file mode 100644
index 000000000..a1c92c31f
Binary files /dev/null and b/images/pkmn/026witch_.png differ
diff --git a/images/pkmn/026witch_s.png b/images/pkmn/026witch_s.png
new file mode 100644
index 000000000..00f7ac2f9
Binary files /dev/null and b/images/pkmn/026witch_s.png differ
diff --git a/images/pkmn/027_a.png b/images/pkmn/027_a.png
new file mode 100644
index 000000000..06c3eb4c6
Binary files /dev/null and b/images/pkmn/027_a.png differ
diff --git a/images/pkmn/027_as.png b/images/pkmn/027_as.png
new file mode 100644
index 000000000..dab324ac2
Binary files /dev/null and b/images/pkmn/027_as.png differ
diff --git a/images/pkmn/027_s.png b/images/pkmn/027_s.png
new file mode 100644
index 000000000..08c52d669
Binary files /dev/null and b/images/pkmn/027_s.png differ
diff --git a/images/pkmn/028_a.png b/images/pkmn/028_a.png
new file mode 100644
index 000000000..e3bfe7b29
Binary files /dev/null and b/images/pkmn/028_a.png differ
diff --git a/images/pkmn/028_as.png b/images/pkmn/028_as.png
new file mode 100644
index 000000000..fd7cdc341
Binary files /dev/null and b/images/pkmn/028_as.png differ
diff --git a/images/pkmn/028_s.png b/images/pkmn/028_s.png
new file mode 100644
index 000000000..5c7d1b61d
Binary files /dev/null and b/images/pkmn/028_s.png differ
diff --git a/images/pkmn/029_s.png b/images/pkmn/029_s.png
new file mode 100644
index 000000000..103b8ad04
Binary files /dev/null and b/images/pkmn/029_s.png differ
diff --git a/images/pkmn/030_s.png b/images/pkmn/030_s.png
new file mode 100644
index 000000000..e19499228
Binary files /dev/null and b/images/pkmn/030_s.png differ
diff --git a/images/pkmn/031_s.png b/images/pkmn/031_s.png
new file mode 100644
index 000000000..a4b0d01c7
Binary files /dev/null and b/images/pkmn/031_s.png differ
diff --git a/images/pkmn/032_s.png b/images/pkmn/032_s.png
new file mode 100644
index 000000000..b868daaaf
Binary files /dev/null and b/images/pkmn/032_s.png differ
diff --git a/images/pkmn/033_s.png b/images/pkmn/033_s.png
new file mode 100644
index 000000000..d696e40df
Binary files /dev/null and b/images/pkmn/033_s.png differ
diff --git a/images/pkmn/034_s.png b/images/pkmn/034_s.png
new file mode 100644
index 000000000..f398660d0
Binary files /dev/null and b/images/pkmn/034_s.png differ
diff --git a/images/pkmn/035_s.png b/images/pkmn/035_s.png
new file mode 100644
index 000000000..d34222973
Binary files /dev/null and b/images/pkmn/035_s.png differ
diff --git a/images/pkmn/036_s.png b/images/pkmn/036_s.png
new file mode 100644
index 000000000..b985c1c8d
Binary files /dev/null and b/images/pkmn/036_s.png differ
diff --git a/images/pkmn/037_a.png b/images/pkmn/037_a.png
new file mode 100644
index 000000000..b8f62420f
Binary files /dev/null and b/images/pkmn/037_a.png differ
diff --git a/images/pkmn/037_as.png b/images/pkmn/037_as.png
new file mode 100644
index 000000000..354ceef0f
Binary files /dev/null and b/images/pkmn/037_as.png differ
diff --git a/images/pkmn/037_s.png b/images/pkmn/037_s.png
new file mode 100644
index 000000000..2c3ad24fc
Binary files /dev/null and b/images/pkmn/037_s.png differ
diff --git a/images/pkmn/038_a.png b/images/pkmn/038_a.png
new file mode 100644
index 000000000..8a06dcdca
Binary files /dev/null and b/images/pkmn/038_a.png differ
diff --git a/images/pkmn/038_as.png b/images/pkmn/038_as.png
new file mode 100644
index 000000000..2f17baca9
Binary files /dev/null and b/images/pkmn/038_as.png differ
diff --git a/images/pkmn/038_s.png b/images/pkmn/038_s.png
new file mode 100644
index 000000000..5c4578f0a
Binary files /dev/null and b/images/pkmn/038_s.png differ
diff --git a/images/pkmn/041_s.png b/images/pkmn/041_s.png
new file mode 100644
index 000000000..78d3d4ec3
Binary files /dev/null and b/images/pkmn/041_s.png differ
diff --git a/images/pkmn/044_s.png b/images/pkmn/044_s.png
new file mode 100644
index 000000000..79bd57728
Binary files /dev/null and b/images/pkmn/044_s.png differ
diff --git a/images/pkmn/045_s.png b/images/pkmn/045_s.png
new file mode 100644
index 000000000..9dd1dccf0
Binary files /dev/null and b/images/pkmn/045_s.png differ
diff --git a/images/pkmn/047_s.png b/images/pkmn/047_s.png
new file mode 100644
index 000000000..1a67a0087
Binary files /dev/null and b/images/pkmn/047_s.png differ
diff --git a/images/pkmn/048_s.png b/images/pkmn/048_s.png
new file mode 100644
index 000000000..045af1a93
Binary files /dev/null and b/images/pkmn/048_s.png differ
diff --git a/images/pkmn/050_a.png b/images/pkmn/050_a.png
new file mode 100644
index 000000000..89266f32c
Binary files /dev/null and b/images/pkmn/050_a.png differ
diff --git a/images/pkmn/050_as.png b/images/pkmn/050_as.png
new file mode 100644
index 000000000..950e60eb7
Binary files /dev/null and b/images/pkmn/050_as.png differ
diff --git a/images/pkmn/050_s.png b/images/pkmn/050_s.png
new file mode 100644
index 000000000..6a274a2ec
Binary files /dev/null and b/images/pkmn/050_s.png differ
diff --git a/images/pkmn/051_a.png b/images/pkmn/051_a.png
new file mode 100644
index 000000000..3129bf507
Binary files /dev/null and b/images/pkmn/051_a.png differ
diff --git a/images/pkmn/051_as.png b/images/pkmn/051_as.png
new file mode 100644
index 000000000..548e2bfcd
Binary files /dev/null and b/images/pkmn/051_as.png differ
diff --git a/images/pkmn/051_s.png b/images/pkmn/051_s.png
new file mode 100644
index 000000000..f5c212de1
Binary files /dev/null and b/images/pkmn/051_s.png differ
diff --git a/images/pkmn/052_a.png b/images/pkmn/052_a.png
new file mode 100644
index 000000000..a675f30d6
Binary files /dev/null and b/images/pkmn/052_a.png differ
diff --git a/images/pkmn/052_as.png b/images/pkmn/052_as.png
new file mode 100644
index 000000000..36a530b35
Binary files /dev/null and b/images/pkmn/052_as.png differ
diff --git a/images/pkmn/052_s.png b/images/pkmn/052_s.png
new file mode 100644
index 000000000..a99cff816
Binary files /dev/null and b/images/pkmn/052_s.png differ
diff --git a/images/pkmn/053_a.png b/images/pkmn/053_a.png
new file mode 100644
index 000000000..68e3afae9
Binary files /dev/null and b/images/pkmn/053_a.png differ
diff --git a/images/pkmn/053_as.png b/images/pkmn/053_as.png
new file mode 100644
index 000000000..7f744348c
Binary files /dev/null and b/images/pkmn/053_as.png differ
diff --git a/images/pkmn/053_s.png b/images/pkmn/053_s.png
new file mode 100644
index 000000000..6cccbfcb7
Binary files /dev/null and b/images/pkmn/053_s.png differ
diff --git a/images/pkmn/054_s.png b/images/pkmn/054_s.png
new file mode 100644
index 000000000..61d07c853
Binary files /dev/null and b/images/pkmn/054_s.png differ
diff --git a/images/pkmn/055_s.png b/images/pkmn/055_s.png
new file mode 100644
index 000000000..4e3921239
Binary files /dev/null and b/images/pkmn/055_s.png differ
diff --git a/images/pkmn/056_s.png b/images/pkmn/056_s.png
new file mode 100644
index 000000000..4a52b3b35
Binary files /dev/null and b/images/pkmn/056_s.png differ
diff --git a/images/pkmn/057_s.png b/images/pkmn/057_s.png
new file mode 100644
index 000000000..1392d59ca
Binary files /dev/null and b/images/pkmn/057_s.png differ
diff --git a/images/pkmn/058_s.png b/images/pkmn/058_s.png
new file mode 100644
index 000000000..086378003
Binary files /dev/null and b/images/pkmn/058_s.png differ
diff --git a/images/pkmn/059_s.png b/images/pkmn/059_s.png
new file mode 100644
index 000000000..7357130b5
Binary files /dev/null and b/images/pkmn/059_s.png differ
diff --git a/images/pkmn/060_s.png b/images/pkmn/060_s.png
new file mode 100644
index 000000000..f77f0d928
Binary files /dev/null and b/images/pkmn/060_s.png differ
diff --git a/images/pkmn/061_s.png b/images/pkmn/061_s.png
new file mode 100644
index 000000000..6dff7b7cc
Binary files /dev/null and b/images/pkmn/061_s.png differ
diff --git a/images/pkmn/062_s.png b/images/pkmn/062_s.png
new file mode 100644
index 000000000..3a07d29dc
Binary files /dev/null and b/images/pkmn/062_s.png differ
diff --git a/images/pkmn/063_s.png b/images/pkmn/063_s.png
new file mode 100644
index 000000000..1a7153f08
Binary files /dev/null and b/images/pkmn/063_s.png differ
diff --git a/images/pkmn/064_s.png b/images/pkmn/064_s.png
new file mode 100644
index 000000000..42437a288
Binary files /dev/null and b/images/pkmn/064_s.png differ
diff --git a/images/pkmn/065_s.png b/images/pkmn/065_s.png
new file mode 100644
index 000000000..759796a7e
Binary files /dev/null and b/images/pkmn/065_s.png differ
diff --git a/images/pkmn/066_s.png b/images/pkmn/066_s.png
new file mode 100644
index 000000000..82ed15f7a
Binary files /dev/null and b/images/pkmn/066_s.png differ
diff --git a/images/pkmn/067_s.png b/images/pkmn/067_s.png
new file mode 100644
index 000000000..c241f2b8a
Binary files /dev/null and b/images/pkmn/067_s.png differ
diff --git a/images/pkmn/068_s.png b/images/pkmn/068_s.png
new file mode 100644
index 000000000..bc42ea9b8
Binary files /dev/null and b/images/pkmn/068_s.png differ
diff --git a/images/pkmn/070_s.png b/images/pkmn/070_s.png
new file mode 100644
index 000000000..43b17e990
Binary files /dev/null and b/images/pkmn/070_s.png differ
diff --git a/images/pkmn/071_s.png b/images/pkmn/071_s.png
new file mode 100644
index 000000000..d426c11cb
Binary files /dev/null and b/images/pkmn/071_s.png differ
diff --git a/images/pkmn/072_s.png b/images/pkmn/072_s.png
new file mode 100644
index 000000000..378e319ba
Binary files /dev/null and b/images/pkmn/072_s.png differ
diff --git a/images/pkmn/073_s.png b/images/pkmn/073_s.png
new file mode 100644
index 000000000..0551e5654
Binary files /dev/null and b/images/pkmn/073_s.png differ
diff --git a/images/pkmn/074_a.png b/images/pkmn/074_a.png
new file mode 100644
index 000000000..2291d3c4c
Binary files /dev/null and b/images/pkmn/074_a.png differ
diff --git a/images/pkmn/074_as.png b/images/pkmn/074_as.png
new file mode 100644
index 000000000..e7af14c65
Binary files /dev/null and b/images/pkmn/074_as.png differ
diff --git a/images/pkmn/074_s.png b/images/pkmn/074_s.png
new file mode 100644
index 000000000..1ea2a428a
Binary files /dev/null and b/images/pkmn/074_s.png differ
diff --git a/images/pkmn/075_a.png b/images/pkmn/075_a.png
new file mode 100644
index 000000000..9f0328d7f
Binary files /dev/null and b/images/pkmn/075_a.png differ
diff --git a/images/pkmn/075_as.png b/images/pkmn/075_as.png
new file mode 100644
index 000000000..d153a9b11
Binary files /dev/null and b/images/pkmn/075_as.png differ
diff --git a/images/pkmn/075_s.png b/images/pkmn/075_s.png
new file mode 100644
index 000000000..cc8eeef62
Binary files /dev/null and b/images/pkmn/075_s.png differ
diff --git a/images/pkmn/076_a.png b/images/pkmn/076_a.png
new file mode 100644
index 000000000..f00dced60
Binary files /dev/null and b/images/pkmn/076_a.png differ
diff --git a/images/pkmn/076_as.png b/images/pkmn/076_as.png
new file mode 100644
index 000000000..1dbb8cf99
Binary files /dev/null and b/images/pkmn/076_as.png differ
diff --git a/images/pkmn/076_s.png b/images/pkmn/076_s.png
new file mode 100644
index 000000000..15d3a69c7
Binary files /dev/null and b/images/pkmn/076_s.png differ
diff --git a/images/pkmn/079_s.png b/images/pkmn/079_s.png
new file mode 100644
index 000000000..69bdb2c20
Binary files /dev/null and b/images/pkmn/079_s.png differ
diff --git a/images/pkmn/080_s.png b/images/pkmn/080_s.png
new file mode 100644
index 000000000..396867ecc
Binary files /dev/null and b/images/pkmn/080_s.png differ
diff --git a/images/pkmn/084_s.png b/images/pkmn/084_s.png
new file mode 100644
index 000000000..2c59d64f1
Binary files /dev/null and b/images/pkmn/084_s.png differ
diff --git a/images/pkmn/085_s.png b/images/pkmn/085_s.png
new file mode 100644
index 000000000..76c0dc8f7
Binary files /dev/null and b/images/pkmn/085_s.png differ
diff --git a/images/pkmn/086_s.png b/images/pkmn/086_s.png
new file mode 100644
index 000000000..8454a2dea
Binary files /dev/null and b/images/pkmn/086_s.png differ
diff --git a/images/pkmn/087_s.png b/images/pkmn/087_s.png
new file mode 100644
index 000000000..6021ed52c
Binary files /dev/null and b/images/pkmn/087_s.png differ
diff --git a/images/pkmn/088_a.png b/images/pkmn/088_a.png
new file mode 100644
index 000000000..ac6e124d0
Binary files /dev/null and b/images/pkmn/088_a.png differ
diff --git a/images/pkmn/088_as.png b/images/pkmn/088_as.png
new file mode 100644
index 000000000..ccf2cd9fa
Binary files /dev/null and b/images/pkmn/088_as.png differ
diff --git a/images/pkmn/088_s.png b/images/pkmn/088_s.png
new file mode 100644
index 000000000..0f252e835
Binary files /dev/null and b/images/pkmn/088_s.png differ
diff --git a/images/pkmn/089_a.png b/images/pkmn/089_a.png
new file mode 100644
index 000000000..579c2484b
Binary files /dev/null and b/images/pkmn/089_a.png differ
diff --git a/images/pkmn/089_as.png b/images/pkmn/089_as.png
new file mode 100644
index 000000000..9139e973b
Binary files /dev/null and b/images/pkmn/089_as.png differ
diff --git a/images/pkmn/089_s.png b/images/pkmn/089_s.png
new file mode 100644
index 000000000..7e0a56c50
Binary files /dev/null and b/images/pkmn/089_s.png differ
diff --git a/images/pkmn/090_s.png b/images/pkmn/090_s.png
new file mode 100644
index 000000000..0af5457ed
Binary files /dev/null and b/images/pkmn/090_s.png differ
diff --git a/images/pkmn/091_s.png b/images/pkmn/091_s.png
new file mode 100644
index 000000000..144e59d80
Binary files /dev/null and b/images/pkmn/091_s.png differ
diff --git a/images/pkmn/092_s.png b/images/pkmn/092_s.png
new file mode 100644
index 000000000..2e528c715
Binary files /dev/null and b/images/pkmn/092_s.png differ
diff --git a/images/pkmn/093_s.png b/images/pkmn/093_s.png
new file mode 100644
index 000000000..2aaaeb321
Binary files /dev/null and b/images/pkmn/093_s.png differ
diff --git a/images/pkmn/094_s.png b/images/pkmn/094_s.png
new file mode 100644
index 000000000..75bc74a39
Binary files /dev/null and b/images/pkmn/094_s.png differ
diff --git a/images/pkmn/095_s.png b/images/pkmn/095_s.png
new file mode 100644
index 000000000..8b8148562
Binary files /dev/null and b/images/pkmn/095_s.png differ
diff --git a/images/pkmn/096_s.png b/images/pkmn/096_s.png
new file mode 100644
index 000000000..bf22d24ee
Binary files /dev/null and b/images/pkmn/096_s.png differ
diff --git a/images/pkmn/097_s.png b/images/pkmn/097_s.png
new file mode 100644
index 000000000..1aac3bab8
Binary files /dev/null and b/images/pkmn/097_s.png differ
diff --git a/images/pkmn/098_s.png b/images/pkmn/098_s.png
new file mode 100644
index 000000000..0e6eefa62
Binary files /dev/null and b/images/pkmn/098_s.png differ
diff --git a/images/pkmn/099_s.png b/images/pkmn/099_s.png
new file mode 100644
index 000000000..2b4a5514d
Binary files /dev/null and b/images/pkmn/099_s.png differ
diff --git a/images/pkmn/102_s.png b/images/pkmn/102_s.png
new file mode 100644
index 000000000..33139b09e
Binary files /dev/null and b/images/pkmn/102_s.png differ
diff --git a/images/pkmn/103_a.png b/images/pkmn/103_a.png
new file mode 100644
index 000000000..75c27cb12
Binary files /dev/null and b/images/pkmn/103_a.png differ
diff --git a/images/pkmn/103_as.png b/images/pkmn/103_as.png
new file mode 100644
index 000000000..cfeedb496
Binary files /dev/null and b/images/pkmn/103_as.png differ
diff --git a/images/pkmn/103_s.png b/images/pkmn/103_s.png
new file mode 100644
index 000000000..ea3db49ec
Binary files /dev/null and b/images/pkmn/103_s.png differ
diff --git a/images/pkmn/104_s.png b/images/pkmn/104_s.png
new file mode 100644
index 000000000..9fe8a8388
Binary files /dev/null and b/images/pkmn/104_s.png differ
diff --git a/images/pkmn/105_a.png b/images/pkmn/105_a.png
new file mode 100644
index 000000000..82fad2db7
Binary files /dev/null and b/images/pkmn/105_a.png differ
diff --git a/images/pkmn/105_as.png b/images/pkmn/105_as.png
new file mode 100644
index 000000000..a48deac83
Binary files /dev/null and b/images/pkmn/105_as.png differ
diff --git a/images/pkmn/105_s.png b/images/pkmn/105_s.png
new file mode 100644
index 000000000..ff68ff7df
Binary files /dev/null and b/images/pkmn/105_s.png differ
diff --git a/images/pkmn/106_s.png b/images/pkmn/106_s.png
new file mode 100644
index 000000000..61b6e5d6f
Binary files /dev/null and b/images/pkmn/106_s.png differ
diff --git a/images/pkmn/107_s.png b/images/pkmn/107_s.png
new file mode 100644
index 000000000..8ac516db2
Binary files /dev/null and b/images/pkmn/107_s.png differ
diff --git a/images/pkmn/108_s.png b/images/pkmn/108_s.png
new file mode 100644
index 000000000..3cac59d0a
Binary files /dev/null and b/images/pkmn/108_s.png differ
diff --git a/images/pkmn/111_s.png b/images/pkmn/111_s.png
new file mode 100644
index 000000000..32de23278
Binary files /dev/null and b/images/pkmn/111_s.png differ
diff --git a/images/pkmn/112_s.png b/images/pkmn/112_s.png
new file mode 100644
index 000000000..037c3dbe4
Binary files /dev/null and b/images/pkmn/112_s.png differ
diff --git a/images/pkmn/115_s.png b/images/pkmn/115_s.png
new file mode 100644
index 000000000..6ca3304eb
Binary files /dev/null and b/images/pkmn/115_s.png differ
diff --git a/images/pkmn/116_s.png b/images/pkmn/116_s.png
new file mode 100644
index 000000000..6edac492b
Binary files /dev/null and b/images/pkmn/116_s.png differ
diff --git a/images/pkmn/117_s.png b/images/pkmn/117_s.png
new file mode 100644
index 000000000..cfa64ae18
Binary files /dev/null and b/images/pkmn/117_s.png differ
diff --git a/images/pkmn/118_s.png b/images/pkmn/118_s.png
new file mode 100644
index 000000000..723afb527
Binary files /dev/null and b/images/pkmn/118_s.png differ
diff --git a/images/pkmn/119_s.png b/images/pkmn/119_s.png
new file mode 100644
index 000000000..cfcafad66
Binary files /dev/null and b/images/pkmn/119_s.png differ
diff --git a/images/pkmn/122_s.png b/images/pkmn/122_s.png
new file mode 100644
index 000000000..9c37917a5
Binary files /dev/null and b/images/pkmn/122_s.png differ
diff --git a/images/pkmn/124_s.png b/images/pkmn/124_s.png
new file mode 100644
index 000000000..6ad6d948f
Binary files /dev/null and b/images/pkmn/124_s.png differ
diff --git a/images/pkmn/126_s.png b/images/pkmn/126_s.png
new file mode 100644
index 000000000..6f342d633
Binary files /dev/null and b/images/pkmn/126_s.png differ
diff --git a/images/pkmn/127_s.png b/images/pkmn/127_s.png
new file mode 100644
index 000000000..651048a9a
Binary files /dev/null and b/images/pkmn/127_s.png differ
diff --git a/images/pkmn/128_s.png b/images/pkmn/128_s.png
new file mode 100644
index 000000000..b0b5df227
Binary files /dev/null and b/images/pkmn/128_s.png differ
diff --git a/images/pkmn/129_s.png b/images/pkmn/129_s.png
new file mode 100644
index 000000000..3a68237e1
Binary files /dev/null and b/images/pkmn/129_s.png differ
diff --git a/images/pkmn/130_s.png b/images/pkmn/130_s.png
new file mode 100644
index 000000000..a58ed58c3
Binary files /dev/null and b/images/pkmn/130_s.png differ
diff --git a/images/pkmn/131_s.png b/images/pkmn/131_s.png
new file mode 100644
index 000000000..7357ea384
Binary files /dev/null and b/images/pkmn/131_s.png differ
diff --git a/images/pkmn/133_s.png b/images/pkmn/133_s.png
new file mode 100644
index 000000000..d9f659f75
Binary files /dev/null and b/images/pkmn/133_s.png differ
diff --git a/images/pkmn/134_s.png b/images/pkmn/134_s.png
new file mode 100644
index 000000000..c778e0944
Binary files /dev/null and b/images/pkmn/134_s.png differ
diff --git a/images/pkmn/135_s.png b/images/pkmn/135_s.png
new file mode 100644
index 000000000..1cb151384
Binary files /dev/null and b/images/pkmn/135_s.png differ
diff --git a/images/pkmn/136_s.png b/images/pkmn/136_s.png
new file mode 100644
index 000000000..2061a26ff
Binary files /dev/null and b/images/pkmn/136_s.png differ
diff --git a/images/pkmn/137_s.png b/images/pkmn/137_s.png
new file mode 100644
index 000000000..6a12f093b
Binary files /dev/null and b/images/pkmn/137_s.png differ
diff --git a/images/pkmn/138_s.png b/images/pkmn/138_s.png
new file mode 100644
index 000000000..07c396603
Binary files /dev/null and b/images/pkmn/138_s.png differ
diff --git a/images/pkmn/139_s.png b/images/pkmn/139_s.png
new file mode 100644
index 000000000..0ef7f7092
Binary files /dev/null and b/images/pkmn/139_s.png differ
diff --git a/images/pkmn/140_s.png b/images/pkmn/140_s.png
new file mode 100644
index 000000000..5bd479d7f
Binary files /dev/null and b/images/pkmn/140_s.png differ
diff --git a/images/pkmn/141_s.png b/images/pkmn/141_s.png
new file mode 100644
index 000000000..89351c194
Binary files /dev/null and b/images/pkmn/141_s.png differ
diff --git a/images/pkmn/142_s.png b/images/pkmn/142_s.png
new file mode 100644
index 000000000..4caf8b497
Binary files /dev/null and b/images/pkmn/142_s.png differ
diff --git a/images/pkmn/143_s.png b/images/pkmn/143_s.png
new file mode 100644
index 000000000..57022ef1c
Binary files /dev/null and b/images/pkmn/143_s.png differ
diff --git a/images/pkmn/144_s.png b/images/pkmn/144_s.png
new file mode 100644
index 000000000..1b78197b5
Binary files /dev/null and b/images/pkmn/144_s.png differ
diff --git a/images/pkmn/145_s.png b/images/pkmn/145_s.png
new file mode 100644
index 000000000..e5ab8a706
Binary files /dev/null and b/images/pkmn/145_s.png differ
diff --git a/images/pkmn/146_s.png b/images/pkmn/146_s.png
new file mode 100644
index 000000000..9ee752136
Binary files /dev/null and b/images/pkmn/146_s.png differ
diff --git a/images/pkmn/147_s.png b/images/pkmn/147_s.png
new file mode 100644
index 000000000..f3c0a7d6c
Binary files /dev/null and b/images/pkmn/147_s.png differ
diff --git a/images/pkmn/148_s.png b/images/pkmn/148_s.png
new file mode 100644
index 000000000..f7be31c64
Binary files /dev/null and b/images/pkmn/148_s.png differ
diff --git a/images/pkmn/149_s.png b/images/pkmn/149_s.png
new file mode 100644
index 000000000..8e95943cf
Binary files /dev/null and b/images/pkmn/149_s.png differ
diff --git a/images/pkmn/150_s.png b/images/pkmn/150_s.png
new file mode 100644
index 000000000..0cc924177
Binary files /dev/null and b/images/pkmn/150_s.png differ
diff --git a/images/pkmn/151_s.png b/images/pkmn/151_s.png
new file mode 100644
index 000000000..c3818df14
Binary files /dev/null and b/images/pkmn/151_s.png differ
diff --git a/images/pkmn/152_s.png b/images/pkmn/152_s.png
new file mode 100644
index 000000000..b3037f3cb
Binary files /dev/null and b/images/pkmn/152_s.png differ
diff --git a/images/pkmn/153_s.png b/images/pkmn/153_s.png
new file mode 100644
index 000000000..67ff42601
Binary files /dev/null and b/images/pkmn/153_s.png differ
diff --git a/images/pkmn/154_s.png b/images/pkmn/154_s.png
new file mode 100644
index 000000000..a8249b60a
Binary files /dev/null and b/images/pkmn/154_s.png differ
diff --git a/images/pkmn/158_s.png b/images/pkmn/158_s.png
new file mode 100644
index 000000000..db717edb8
Binary files /dev/null and b/images/pkmn/158_s.png differ
diff --git a/images/pkmn/159_s.png b/images/pkmn/159_s.png
new file mode 100644
index 000000000..2ad81bf1a
Binary files /dev/null and b/images/pkmn/159_s.png differ
diff --git a/images/pkmn/160_s.png b/images/pkmn/160_s.png
new file mode 100644
index 000000000..17ce9d866
Binary files /dev/null and b/images/pkmn/160_s.png differ
diff --git a/images/pkmn/161_s.png b/images/pkmn/161_s.png
new file mode 100644
index 000000000..4ff8e404b
Binary files /dev/null and b/images/pkmn/161_s.png differ
diff --git a/images/pkmn/162_s.png b/images/pkmn/162_s.png
new file mode 100644
index 000000000..446a30901
Binary files /dev/null and b/images/pkmn/162_s.png differ
diff --git a/images/pkmn/164_s.png b/images/pkmn/164_s.png
new file mode 100644
index 000000000..1c0d59497
Binary files /dev/null and b/images/pkmn/164_s.png differ
diff --git a/images/pkmn/165_s.png b/images/pkmn/165_s.png
new file mode 100644
index 000000000..c7a42f2c5
Binary files /dev/null and b/images/pkmn/165_s.png differ
diff --git a/images/pkmn/166_s.png b/images/pkmn/166_s.png
new file mode 100644
index 000000000..b4d985d3d
Binary files /dev/null and b/images/pkmn/166_s.png differ
diff --git a/images/pkmn/167_s.png b/images/pkmn/167_s.png
new file mode 100644
index 000000000..a5b0373cc
Binary files /dev/null and b/images/pkmn/167_s.png differ
diff --git a/images/pkmn/168_s.png b/images/pkmn/168_s.png
new file mode 100644
index 000000000..736770c61
Binary files /dev/null and b/images/pkmn/168_s.png differ
diff --git a/images/pkmn/169_s.png b/images/pkmn/169_s.png
new file mode 100644
index 000000000..6bb6fec59
Binary files /dev/null and b/images/pkmn/169_s.png differ
diff --git a/images/pkmn/172_s.png b/images/pkmn/172_s.png
new file mode 100644
index 000000000..a986a9acc
Binary files /dev/null and b/images/pkmn/172_s.png differ
diff --git a/images/pkmn/172ash_.png b/images/pkmn/172ash_.png
new file mode 100644
index 000000000..349f1fce1
Binary files /dev/null and b/images/pkmn/172ash_.png differ
diff --git a/images/pkmn/172ash_s.png b/images/pkmn/172ash_s.png
new file mode 100644
index 000000000..c3b6a7f23
Binary files /dev/null and b/images/pkmn/172ash_s.png differ
diff --git a/images/pkmn/172party_.png b/images/pkmn/172party_.png
new file mode 100644
index 000000000..27f90bcf0
Binary files /dev/null and b/images/pkmn/172party_.png differ
diff --git a/images/pkmn/172party_s.png b/images/pkmn/172party_s.png
new file mode 100644
index 000000000..28d417c69
Binary files /dev/null and b/images/pkmn/172party_s.png differ
diff --git a/images/pkmn/172santa_.png b/images/pkmn/172santa_.png
new file mode 100644
index 000000000..698a8d509
Binary files /dev/null and b/images/pkmn/172santa_.png differ
diff --git a/images/pkmn/172santa_s.png b/images/pkmn/172santa_s.png
new file mode 100644
index 000000000..760069649
Binary files /dev/null and b/images/pkmn/172santa_s.png differ
diff --git a/images/pkmn/172summer_.png b/images/pkmn/172summer_.png
new file mode 100644
index 000000000..afc23e4de
Binary files /dev/null and b/images/pkmn/172summer_.png differ
diff --git a/images/pkmn/172summer_s.png b/images/pkmn/172summer_s.png
new file mode 100644
index 000000000..1d51330e9
Binary files /dev/null and b/images/pkmn/172summer_s.png differ
diff --git a/images/pkmn/172witch_.png b/images/pkmn/172witch_.png
new file mode 100644
index 000000000..515be7bb2
Binary files /dev/null and b/images/pkmn/172witch_.png differ
diff --git a/images/pkmn/172witch_s.png b/images/pkmn/172witch_s.png
new file mode 100644
index 000000000..a159a1cf2
Binary files /dev/null and b/images/pkmn/172witch_s.png differ
diff --git a/images/pkmn/173_s.png b/images/pkmn/173_s.png
new file mode 100644
index 000000000..84817a174
Binary files /dev/null and b/images/pkmn/173_s.png differ
diff --git a/images/pkmn/174_s.png b/images/pkmn/174_s.png
new file mode 100644
index 000000000..e8cbb0d4f
Binary files /dev/null and b/images/pkmn/174_s.png differ
diff --git a/images/pkmn/175_s.png b/images/pkmn/175_s.png
new file mode 100644
index 000000000..ee4dbbe42
Binary files /dev/null and b/images/pkmn/175_s.png differ
diff --git a/images/pkmn/176_s.png b/images/pkmn/176_s.png
new file mode 100644
index 000000000..db534dd11
Binary files /dev/null and b/images/pkmn/176_s.png differ
diff --git a/images/pkmn/177_s.png b/images/pkmn/177_s.png
new file mode 100644
index 000000000..7d9e1f7b7
Binary files /dev/null and b/images/pkmn/177_s.png differ
diff --git a/images/pkmn/178_s.png b/images/pkmn/178_s.png
new file mode 100644
index 000000000..7af7a6f4e
Binary files /dev/null and b/images/pkmn/178_s.png differ
diff --git a/images/pkmn/179_s.png b/images/pkmn/179_s.png
new file mode 100644
index 000000000..533fd7589
Binary files /dev/null and b/images/pkmn/179_s.png differ
diff --git a/images/pkmn/180_s.png b/images/pkmn/180_s.png
new file mode 100644
index 000000000..fd1f4c089
Binary files /dev/null and b/images/pkmn/180_s.png differ
diff --git a/images/pkmn/181_s.png b/images/pkmn/181_s.png
new file mode 100644
index 000000000..e01593166
Binary files /dev/null and b/images/pkmn/181_s.png differ
diff --git a/images/pkmn/185_s.png b/images/pkmn/185_s.png
new file mode 100644
index 000000000..c54870ba9
Binary files /dev/null and b/images/pkmn/185_s.png differ
diff --git a/images/pkmn/187_s.png b/images/pkmn/187_s.png
new file mode 100644
index 000000000..00c51eb55
Binary files /dev/null and b/images/pkmn/187_s.png differ
diff --git a/images/pkmn/188_s.png b/images/pkmn/188_s.png
new file mode 100644
index 000000000..3cb442e69
Binary files /dev/null and b/images/pkmn/188_s.png differ
diff --git a/images/pkmn/189_s.png b/images/pkmn/189_s.png
new file mode 100644
index 000000000..5f36ed0c3
Binary files /dev/null and b/images/pkmn/189_s.png differ
diff --git a/images/pkmn/190_s.png b/images/pkmn/190_s.png
new file mode 100644
index 000000000..a32058916
Binary files /dev/null and b/images/pkmn/190_s.png differ
diff --git a/images/pkmn/191_s.png b/images/pkmn/191_s.png
new file mode 100644
index 000000000..1fc360482
Binary files /dev/null and b/images/pkmn/191_s.png differ
diff --git a/images/pkmn/192_s.png b/images/pkmn/192_s.png
new file mode 100644
index 000000000..947d62715
Binary files /dev/null and b/images/pkmn/192_s.png differ
diff --git a/images/pkmn/194_s.png b/images/pkmn/194_s.png
new file mode 100644
index 000000000..06932ae4c
Binary files /dev/null and b/images/pkmn/194_s.png differ
diff --git a/images/pkmn/195_s.png b/images/pkmn/195_s.png
new file mode 100644
index 000000000..e224a9ed3
Binary files /dev/null and b/images/pkmn/195_s.png differ
diff --git a/images/pkmn/196_s.png b/images/pkmn/196_s.png
new file mode 100644
index 000000000..c20d96814
Binary files /dev/null and b/images/pkmn/196_s.png differ
diff --git a/images/pkmn/197_s.png b/images/pkmn/197_s.png
new file mode 100644
index 000000000..f31fcc2e8
Binary files /dev/null and b/images/pkmn/197_s.png differ
diff --git a/images/pkmn/198_s.png b/images/pkmn/198_s.png
new file mode 100644
index 000000000..68bfa4a79
Binary files /dev/null and b/images/pkmn/198_s.png differ
diff --git a/images/pkmn/199_s.png b/images/pkmn/199_s.png
new file mode 100644
index 000000000..a99354195
Binary files /dev/null and b/images/pkmn/199_s.png differ
diff --git a/images/pkmn/200_s.png b/images/pkmn/200_s.png
new file mode 100644
index 000000000..d8442fa09
Binary files /dev/null and b/images/pkmn/200_s.png differ
diff --git a/images/pkmn/201!_.png b/images/pkmn/201!_.png
new file mode 100644
index 000000000..f7b25733b
Binary files /dev/null and b/images/pkmn/201!_.png differ
diff --git a/images/pkmn/201a_.png b/images/pkmn/201a_.png
new file mode 100644
index 000000000..a8ffaac9b
Binary files /dev/null and b/images/pkmn/201a_.png differ
diff --git a/images/pkmn/201b_.png b/images/pkmn/201b_.png
new file mode 100644
index 000000000..79f77e9ef
Binary files /dev/null and b/images/pkmn/201b_.png differ
diff --git a/images/pkmn/201c_.png b/images/pkmn/201c_.png
new file mode 100644
index 000000000..9f2da2a17
Binary files /dev/null and b/images/pkmn/201c_.png differ
diff --git a/images/pkmn/201d_.png b/images/pkmn/201d_.png
new file mode 100644
index 000000000..c7b8f7ca0
Binary files /dev/null and b/images/pkmn/201d_.png differ
diff --git a/images/pkmn/201e_.png b/images/pkmn/201e_.png
new file mode 100644
index 000000000..973f033c8
Binary files /dev/null and b/images/pkmn/201e_.png differ
diff --git a/images/pkmn/201f_.png b/images/pkmn/201f_.png
new file mode 100644
index 000000000..758ea4138
Binary files /dev/null and b/images/pkmn/201f_.png differ
diff --git a/images/pkmn/201g_.png b/images/pkmn/201g_.png
new file mode 100644
index 000000000..05d942af9
Binary files /dev/null and b/images/pkmn/201g_.png differ
diff --git a/images/pkmn/201h_.png b/images/pkmn/201h_.png
new file mode 100644
index 000000000..4e068b1e1
Binary files /dev/null and b/images/pkmn/201h_.png differ
diff --git a/images/pkmn/201i_.png b/images/pkmn/201i_.png
new file mode 100644
index 000000000..8307290a3
Binary files /dev/null and b/images/pkmn/201i_.png differ
diff --git a/images/pkmn/201j_.png b/images/pkmn/201j_.png
new file mode 100644
index 000000000..771ab8a5b
Binary files /dev/null and b/images/pkmn/201j_.png differ
diff --git a/images/pkmn/201k_.png b/images/pkmn/201k_.png
new file mode 100644
index 000000000..b130580c9
Binary files /dev/null and b/images/pkmn/201k_.png differ
diff --git a/images/pkmn/201l_.png b/images/pkmn/201l_.png
new file mode 100644
index 000000000..2b9a7a953
Binary files /dev/null and b/images/pkmn/201l_.png differ
diff --git a/images/pkmn/201m_.png b/images/pkmn/201m_.png
new file mode 100644
index 000000000..92064181e
Binary files /dev/null and b/images/pkmn/201m_.png differ
diff --git a/images/pkmn/201n_.png b/images/pkmn/201n_.png
new file mode 100644
index 000000000..5b7d6284c
Binary files /dev/null and b/images/pkmn/201n_.png differ
diff --git a/images/pkmn/201o_.png b/images/pkmn/201o_.png
new file mode 100644
index 000000000..5664a743d
Binary files /dev/null and b/images/pkmn/201o_.png differ
diff --git a/images/pkmn/201p_.png b/images/pkmn/201p_.png
new file mode 100644
index 000000000..1638ef1bf
Binary files /dev/null and b/images/pkmn/201p_.png differ
diff --git a/images/pkmn/201q_.png b/images/pkmn/201q_.png
new file mode 100644
index 000000000..346ec31fc
Binary files /dev/null and b/images/pkmn/201q_.png differ
diff --git a/images/pkmn/201question_.png b/images/pkmn/201question_.png
new file mode 100644
index 000000000..d65bb2276
Binary files /dev/null and b/images/pkmn/201question_.png differ
diff --git a/images/pkmn/201r_.png b/images/pkmn/201r_.png
new file mode 100644
index 000000000..ee4ee77dc
Binary files /dev/null and b/images/pkmn/201r_.png differ
diff --git a/images/pkmn/201s_.png b/images/pkmn/201s_.png
new file mode 100644
index 000000000..760d98b75
Binary files /dev/null and b/images/pkmn/201s_.png differ
diff --git a/images/pkmn/201t_.png b/images/pkmn/201t_.png
new file mode 100644
index 000000000..b0f102f0b
Binary files /dev/null and b/images/pkmn/201t_.png differ
diff --git a/images/pkmn/201u_.png b/images/pkmn/201u_.png
new file mode 100644
index 000000000..c99ac2f1f
Binary files /dev/null and b/images/pkmn/201u_.png differ
diff --git a/images/pkmn/201v_.png b/images/pkmn/201v_.png
new file mode 100644
index 000000000..f2e5108c3
Binary files /dev/null and b/images/pkmn/201v_.png differ
diff --git a/images/pkmn/201w_.png b/images/pkmn/201w_.png
new file mode 100644
index 000000000..03db8de1a
Binary files /dev/null and b/images/pkmn/201w_.png differ
diff --git a/images/pkmn/201x_.png b/images/pkmn/201x_.png
new file mode 100644
index 000000000..15c2c55b1
Binary files /dev/null and b/images/pkmn/201x_.png differ
diff --git a/images/pkmn/201y_.png b/images/pkmn/201y_.png
new file mode 100644
index 000000000..d2344b9e3
Binary files /dev/null and b/images/pkmn/201y_.png differ
diff --git a/images/pkmn/201z_.png b/images/pkmn/201z_.png
new file mode 100644
index 000000000..4717fb353
Binary files /dev/null and b/images/pkmn/201z_.png differ
diff --git a/images/pkmn/202_s.png b/images/pkmn/202_s.png
new file mode 100644
index 000000000..cb2f1ccc4
Binary files /dev/null and b/images/pkmn/202_s.png differ
diff --git a/images/pkmn/204_s.png b/images/pkmn/204_s.png
new file mode 100644
index 000000000..43400805c
Binary files /dev/null and b/images/pkmn/204_s.png differ
diff --git a/images/pkmn/205_s.png b/images/pkmn/205_s.png
new file mode 100644
index 000000000..5aa42175a
Binary files /dev/null and b/images/pkmn/205_s.png differ
diff --git a/images/pkmn/206_s.png b/images/pkmn/206_s.png
new file mode 100644
index 000000000..e0af87656
Binary files /dev/null and b/images/pkmn/206_s.png differ
diff --git a/images/pkmn/207_s.png b/images/pkmn/207_s.png
new file mode 100644
index 000000000..149683c6b
Binary files /dev/null and b/images/pkmn/207_s.png differ
diff --git a/images/pkmn/208_s.png b/images/pkmn/208_s.png
new file mode 100644
index 000000000..c1e2061ca
Binary files /dev/null and b/images/pkmn/208_s.png differ
diff --git a/images/pkmn/209_s.png b/images/pkmn/209_s.png
new file mode 100644
index 000000000..67ce58f50
Binary files /dev/null and b/images/pkmn/209_s.png differ
diff --git a/images/pkmn/210_s.png b/images/pkmn/210_s.png
new file mode 100644
index 000000000..433287bde
Binary files /dev/null and b/images/pkmn/210_s.png differ
diff --git a/images/pkmn/213_s.png b/images/pkmn/213_s.png
new file mode 100644
index 000000000..bea9002e4
Binary files /dev/null and b/images/pkmn/213_s.png differ
diff --git a/images/pkmn/215_s.png b/images/pkmn/215_s.png
new file mode 100644
index 000000000..8d00644c4
Binary files /dev/null and b/images/pkmn/215_s.png differ
diff --git a/images/pkmn/216_s.png b/images/pkmn/216_s.png
new file mode 100644
index 000000000..e6fb0b007
Binary files /dev/null and b/images/pkmn/216_s.png differ
diff --git a/images/pkmn/217_s.png b/images/pkmn/217_s.png
new file mode 100644
index 000000000..b7d15761a
Binary files /dev/null and b/images/pkmn/217_s.png differ
diff --git a/images/pkmn/220_s.png b/images/pkmn/220_s.png
new file mode 100644
index 000000000..eac2cc480
Binary files /dev/null and b/images/pkmn/220_s.png differ
diff --git a/images/pkmn/221_s.png b/images/pkmn/221_s.png
new file mode 100644
index 000000000..dc23c42c6
Binary files /dev/null and b/images/pkmn/221_s.png differ
diff --git a/images/pkmn/222_s.png b/images/pkmn/222_s.png
new file mode 100644
index 000000000..37daf703c
Binary files /dev/null and b/images/pkmn/222_s.png differ
diff --git a/images/pkmn/223_s.png b/images/pkmn/223_s.png
new file mode 100644
index 000000000..16558438e
Binary files /dev/null and b/images/pkmn/223_s.png differ
diff --git a/images/pkmn/228_s.png b/images/pkmn/228_s.png
new file mode 100644
index 000000000..1574f827c
Binary files /dev/null and b/images/pkmn/228_s.png differ
diff --git a/images/pkmn/229_s.png b/images/pkmn/229_s.png
new file mode 100644
index 000000000..c67d0d368
Binary files /dev/null and b/images/pkmn/229_s.png differ
diff --git a/images/pkmn/231_s.png b/images/pkmn/231_s.png
new file mode 100644
index 000000000..6e0bef7a4
Binary files /dev/null and b/images/pkmn/231_s.png differ
diff --git a/images/pkmn/233_s.png b/images/pkmn/233_s.png
new file mode 100644
index 000000000..91b495578
Binary files /dev/null and b/images/pkmn/233_s.png differ
diff --git a/images/pkmn/234_s.png b/images/pkmn/234_s.png
new file mode 100644
index 000000000..cce591d47
Binary files /dev/null and b/images/pkmn/234_s.png differ
diff --git a/images/pkmn/235_s.png b/images/pkmn/235_s.png
new file mode 100644
index 000000000..da275067c
Binary files /dev/null and b/images/pkmn/235_s.png differ
diff --git a/images/pkmn/238_s.png b/images/pkmn/238_s.png
new file mode 100644
index 000000000..8ffe4d524
Binary files /dev/null and b/images/pkmn/238_s.png differ
diff --git a/images/pkmn/240_s.png b/images/pkmn/240_s.png
new file mode 100644
index 000000000..85a9f5b30
Binary files /dev/null and b/images/pkmn/240_s.png differ
diff --git a/images/pkmn/241_s.png b/images/pkmn/241_s.png
new file mode 100644
index 000000000..0545b603d
Binary files /dev/null and b/images/pkmn/241_s.png differ
diff --git a/images/pkmn/243_s.png b/images/pkmn/243_s.png
new file mode 100644
index 000000000..bbc0ac73c
Binary files /dev/null and b/images/pkmn/243_s.png differ
diff --git a/images/pkmn/244_s.png b/images/pkmn/244_s.png
new file mode 100644
index 000000000..e11573d4c
Binary files /dev/null and b/images/pkmn/244_s.png differ
diff --git a/images/pkmn/245_s.png b/images/pkmn/245_s.png
new file mode 100644
index 000000000..1de17957e
Binary files /dev/null and b/images/pkmn/245_s.png differ
diff --git a/images/pkmn/246_s.png b/images/pkmn/246_s.png
new file mode 100644
index 000000000..b72d8c0bf
Binary files /dev/null and b/images/pkmn/246_s.png differ
diff --git a/images/pkmn/247_s.png b/images/pkmn/247_s.png
new file mode 100644
index 000000000..ec8ac8d75
Binary files /dev/null and b/images/pkmn/247_s.png differ
diff --git a/images/pkmn/248_s.png b/images/pkmn/248_s.png
new file mode 100644
index 000000000..a8bd0c6c4
Binary files /dev/null and b/images/pkmn/248_s.png differ
diff --git a/images/pkmn/249_s.png b/images/pkmn/249_s.png
new file mode 100644
index 000000000..91e8ec06b
Binary files /dev/null and b/images/pkmn/249_s.png differ
diff --git a/images/pkmn/250_s.png b/images/pkmn/250_s.png
new file mode 100644
index 000000000..161d5c4e2
Binary files /dev/null and b/images/pkmn/250_s.png differ
diff --git a/images/pkmn/251_s.png b/images/pkmn/251_s.png
new file mode 100644
index 000000000..2c7c620de
Binary files /dev/null and b/images/pkmn/251_s.png differ
diff --git a/images/pkmn/252_s.png b/images/pkmn/252_s.png
new file mode 100644
index 000000000..9b9789f2e
Binary files /dev/null and b/images/pkmn/252_s.png differ
diff --git a/images/pkmn/253_s.png b/images/pkmn/253_s.png
new file mode 100644
index 000000000..888e85cba
Binary files /dev/null and b/images/pkmn/253_s.png differ
diff --git a/images/pkmn/254_s.png b/images/pkmn/254_s.png
new file mode 100644
index 000000000..097499e73
Binary files /dev/null and b/images/pkmn/254_s.png differ
diff --git a/images/pkmn/255_s.png b/images/pkmn/255_s.png
new file mode 100644
index 000000000..23f6d7c52
Binary files /dev/null and b/images/pkmn/255_s.png differ
diff --git a/images/pkmn/256_s.png b/images/pkmn/256_s.png
new file mode 100644
index 000000000..36d10dad0
Binary files /dev/null and b/images/pkmn/256_s.png differ
diff --git a/images/pkmn/257_s.png b/images/pkmn/257_s.png
new file mode 100644
index 000000000..0ecdfcd17
Binary files /dev/null and b/images/pkmn/257_s.png differ
diff --git a/images/pkmn/258_s.png b/images/pkmn/258_s.png
new file mode 100644
index 000000000..14f0c54d1
Binary files /dev/null and b/images/pkmn/258_s.png differ
diff --git a/images/pkmn/259_s.png b/images/pkmn/259_s.png
new file mode 100644
index 000000000..a63fd6f31
Binary files /dev/null and b/images/pkmn/259_s.png differ
diff --git a/images/pkmn/260_s.png b/images/pkmn/260_s.png
new file mode 100644
index 000000000..f77521957
Binary files /dev/null and b/images/pkmn/260_s.png differ
diff --git a/images/pkmn/261_s.png b/images/pkmn/261_s.png
new file mode 100644
index 000000000..fc0b47bf9
Binary files /dev/null and b/images/pkmn/261_s.png differ
diff --git a/images/pkmn/262_s.png b/images/pkmn/262_s.png
new file mode 100644
index 000000000..9a7f14e3e
Binary files /dev/null and b/images/pkmn/262_s.png differ
diff --git a/images/pkmn/263_s.png b/images/pkmn/263_s.png
new file mode 100644
index 000000000..fc6ccb0e1
Binary files /dev/null and b/images/pkmn/263_s.png differ
diff --git a/images/pkmn/264_s.png b/images/pkmn/264_s.png
new file mode 100644
index 000000000..f4dd2f75c
Binary files /dev/null and b/images/pkmn/264_s.png differ
diff --git a/images/pkmn/265_s.png b/images/pkmn/265_s.png
new file mode 100644
index 000000000..25f211c5b
Binary files /dev/null and b/images/pkmn/265_s.png differ
diff --git a/images/pkmn/266_s.png b/images/pkmn/266_s.png
new file mode 100644
index 000000000..de6124cff
Binary files /dev/null and b/images/pkmn/266_s.png differ
diff --git a/images/pkmn/267_s.png b/images/pkmn/267_s.png
new file mode 100644
index 000000000..3b00b983c
Binary files /dev/null and b/images/pkmn/267_s.png differ
diff --git a/images/pkmn/268_s.png b/images/pkmn/268_s.png
new file mode 100644
index 000000000..6487e8879
Binary files /dev/null and b/images/pkmn/268_s.png differ
diff --git a/images/pkmn/269_s.png b/images/pkmn/269_s.png
new file mode 100644
index 000000000..261cde4e2
Binary files /dev/null and b/images/pkmn/269_s.png differ
diff --git a/images/pkmn/270_s.png b/images/pkmn/270_s.png
new file mode 100644
index 000000000..2f2332d75
Binary files /dev/null and b/images/pkmn/270_s.png differ
diff --git a/images/pkmn/271_s.png b/images/pkmn/271_s.png
new file mode 100644
index 000000000..580d16e8d
Binary files /dev/null and b/images/pkmn/271_s.png differ
diff --git a/images/pkmn/272_s.png b/images/pkmn/272_s.png
new file mode 100644
index 000000000..b073d2317
Binary files /dev/null and b/images/pkmn/272_s.png differ
diff --git a/images/pkmn/273_s.png b/images/pkmn/273_s.png
new file mode 100644
index 000000000..7c5764811
Binary files /dev/null and b/images/pkmn/273_s.png differ
diff --git a/images/pkmn/274_s.png b/images/pkmn/274_s.png
new file mode 100644
index 000000000..c45cf37b5
Binary files /dev/null and b/images/pkmn/274_s.png differ
diff --git a/images/pkmn/275_s.png b/images/pkmn/275_s.png
new file mode 100644
index 000000000..08b7a86ef
Binary files /dev/null and b/images/pkmn/275_s.png differ
diff --git a/images/pkmn/276_s.png b/images/pkmn/276_s.png
new file mode 100644
index 000000000..d8123de21
Binary files /dev/null and b/images/pkmn/276_s.png differ
diff --git a/images/pkmn/277_s.png b/images/pkmn/277_s.png
new file mode 100644
index 000000000..d91acc6dd
Binary files /dev/null and b/images/pkmn/277_s.png differ
diff --git a/images/pkmn/278_s.png b/images/pkmn/278_s.png
new file mode 100644
index 000000000..c72fead65
Binary files /dev/null and b/images/pkmn/278_s.png differ
diff --git a/images/pkmn/279_s.png b/images/pkmn/279_s.png
new file mode 100644
index 000000000..d540187bc
Binary files /dev/null and b/images/pkmn/279_s.png differ
diff --git a/images/pkmn/280_s.png b/images/pkmn/280_s.png
new file mode 100644
index 000000000..6f6f7f712
Binary files /dev/null and b/images/pkmn/280_s.png differ
diff --git a/images/pkmn/281_s.png b/images/pkmn/281_s.png
new file mode 100644
index 000000000..4d6d64ff9
Binary files /dev/null and b/images/pkmn/281_s.png differ
diff --git a/images/pkmn/282_s.png b/images/pkmn/282_s.png
new file mode 100644
index 000000000..8b7ed0d79
Binary files /dev/null and b/images/pkmn/282_s.png differ
diff --git a/images/pkmn/283_s.png b/images/pkmn/283_s.png
new file mode 100644
index 000000000..9113d6698
Binary files /dev/null and b/images/pkmn/283_s.png differ
diff --git a/images/pkmn/284_s.png b/images/pkmn/284_s.png
new file mode 100644
index 000000000..4e973bd90
Binary files /dev/null and b/images/pkmn/284_s.png differ
diff --git a/images/pkmn/285_s.png b/images/pkmn/285_s.png
new file mode 100644
index 000000000..70bf6cbaf
Binary files /dev/null and b/images/pkmn/285_s.png differ
diff --git a/images/pkmn/286_s.png b/images/pkmn/286_s.png
new file mode 100644
index 000000000..eff3de7f1
Binary files /dev/null and b/images/pkmn/286_s.png differ
diff --git a/images/pkmn/287_s.png b/images/pkmn/287_s.png
new file mode 100644
index 000000000..fba44dd9b
Binary files /dev/null and b/images/pkmn/287_s.png differ
diff --git a/images/pkmn/288_s.png b/images/pkmn/288_s.png
new file mode 100644
index 000000000..b32469817
Binary files /dev/null and b/images/pkmn/288_s.png differ
diff --git a/images/pkmn/289_s.png b/images/pkmn/289_s.png
new file mode 100644
index 000000000..567217438
Binary files /dev/null and b/images/pkmn/289_s.png differ
diff --git a/images/pkmn/290_s.png b/images/pkmn/290_s.png
new file mode 100644
index 000000000..f6b1df3ac
Binary files /dev/null and b/images/pkmn/290_s.png differ
diff --git a/images/pkmn/291_s.png b/images/pkmn/291_s.png
new file mode 100644
index 000000000..88301105a
Binary files /dev/null and b/images/pkmn/291_s.png differ
diff --git a/images/pkmn/292_s.png b/images/pkmn/292_s.png
new file mode 100644
index 000000000..1dbbbeda5
Binary files /dev/null and b/images/pkmn/292_s.png differ
diff --git a/images/pkmn/293_s.png b/images/pkmn/293_s.png
new file mode 100644
index 000000000..7a0b869f6
Binary files /dev/null and b/images/pkmn/293_s.png differ
diff --git a/images/pkmn/294_s.png b/images/pkmn/294_s.png
new file mode 100644
index 000000000..c43c3834f
Binary files /dev/null and b/images/pkmn/294_s.png differ
diff --git a/images/pkmn/295_s.png b/images/pkmn/295_s.png
new file mode 100644
index 000000000..e4129b6fb
Binary files /dev/null and b/images/pkmn/295_s.png differ
diff --git a/images/pkmn/296_s.png b/images/pkmn/296_s.png
new file mode 100644
index 000000000..e85c8a84a
Binary files /dev/null and b/images/pkmn/296_s.png differ
diff --git a/images/pkmn/297_s.png b/images/pkmn/297_s.png
new file mode 100644
index 000000000..58a289c39
Binary files /dev/null and b/images/pkmn/297_s.png differ
diff --git a/images/pkmn/298_s.png b/images/pkmn/298_s.png
new file mode 100644
index 000000000..7b149e614
Binary files /dev/null and b/images/pkmn/298_s.png differ
diff --git a/images/pkmn/299_s.png b/images/pkmn/299_s.png
new file mode 100644
index 000000000..e84f32a37
Binary files /dev/null and b/images/pkmn/299_s.png differ
diff --git a/images/pkmn/300_s.png b/images/pkmn/300_s.png
new file mode 100644
index 000000000..1198d243d
Binary files /dev/null and b/images/pkmn/300_s.png differ
diff --git a/images/pkmn/301_s.png b/images/pkmn/301_s.png
new file mode 100644
index 000000000..38146d371
Binary files /dev/null and b/images/pkmn/301_s.png differ
diff --git a/images/pkmn/302_s.png b/images/pkmn/302_s.png
new file mode 100644
index 000000000..62f092c7d
Binary files /dev/null and b/images/pkmn/302_s.png differ
diff --git a/images/pkmn/303_s.png b/images/pkmn/303_s.png
new file mode 100644
index 000000000..3befa4ec5
Binary files /dev/null and b/images/pkmn/303_s.png differ
diff --git a/images/pkmn/304_s.png b/images/pkmn/304_s.png
new file mode 100644
index 000000000..63cf9c4a5
Binary files /dev/null and b/images/pkmn/304_s.png differ
diff --git a/images/pkmn/305_s.png b/images/pkmn/305_s.png
new file mode 100644
index 000000000..814bf0f96
Binary files /dev/null and b/images/pkmn/305_s.png differ
diff --git a/images/pkmn/306_s.png b/images/pkmn/306_s.png
new file mode 100644
index 000000000..e4a29c680
Binary files /dev/null and b/images/pkmn/306_s.png differ
diff --git a/images/pkmn/307_s.png b/images/pkmn/307_s.png
new file mode 100644
index 000000000..c470e6e4c
Binary files /dev/null and b/images/pkmn/307_s.png differ
diff --git a/images/pkmn/308_s.png b/images/pkmn/308_s.png
new file mode 100644
index 000000000..1812274e7
Binary files /dev/null and b/images/pkmn/308_s.png differ
diff --git a/images/pkmn/309_s.png b/images/pkmn/309_s.png
new file mode 100644
index 000000000..a7305dd62
Binary files /dev/null and b/images/pkmn/309_s.png differ
diff --git a/images/pkmn/310_s.png b/images/pkmn/310_s.png
new file mode 100644
index 000000000..168ace656
Binary files /dev/null and b/images/pkmn/310_s.png differ
diff --git a/images/pkmn/311_s.png b/images/pkmn/311_s.png
new file mode 100644
index 000000000..8be79732d
Binary files /dev/null and b/images/pkmn/311_s.png differ
diff --git a/images/pkmn/312_s.png b/images/pkmn/312_s.png
new file mode 100644
index 000000000..1cf98115c
Binary files /dev/null and b/images/pkmn/312_s.png differ
diff --git a/images/pkmn/313_s.png b/images/pkmn/313_s.png
new file mode 100644
index 000000000..da1ad6775
Binary files /dev/null and b/images/pkmn/313_s.png differ
diff --git a/images/pkmn/314_s.png b/images/pkmn/314_s.png
new file mode 100644
index 000000000..0a716b105
Binary files /dev/null and b/images/pkmn/314_s.png differ
diff --git a/images/pkmn/315_s.png b/images/pkmn/315_s.png
new file mode 100644
index 000000000..9821530c6
Binary files /dev/null and b/images/pkmn/315_s.png differ
diff --git a/images/pkmn/316_s.png b/images/pkmn/316_s.png
new file mode 100644
index 000000000..91eda2e63
Binary files /dev/null and b/images/pkmn/316_s.png differ
diff --git a/images/pkmn/317_s.png b/images/pkmn/317_s.png
new file mode 100644
index 000000000..d15b5face
Binary files /dev/null and b/images/pkmn/317_s.png differ
diff --git a/images/pkmn/318_s.png b/images/pkmn/318_s.png
new file mode 100644
index 000000000..d471c007e
Binary files /dev/null and b/images/pkmn/318_s.png differ
diff --git a/images/pkmn/319_s.png b/images/pkmn/319_s.png
new file mode 100644
index 000000000..75a7973a2
Binary files /dev/null and b/images/pkmn/319_s.png differ
diff --git a/images/pkmn/320_s.png b/images/pkmn/320_s.png
new file mode 100644
index 000000000..168376900
Binary files /dev/null and b/images/pkmn/320_s.png differ
diff --git a/images/pkmn/321_s.png b/images/pkmn/321_s.png
new file mode 100644
index 000000000..42d396ac4
Binary files /dev/null and b/images/pkmn/321_s.png differ
diff --git a/images/pkmn/322_s.png b/images/pkmn/322_s.png
new file mode 100644
index 000000000..279154fd8
Binary files /dev/null and b/images/pkmn/322_s.png differ
diff --git a/images/pkmn/323_s.png b/images/pkmn/323_s.png
new file mode 100644
index 000000000..f83e1284c
Binary files /dev/null and b/images/pkmn/323_s.png differ
diff --git a/images/pkmn/324_s.png b/images/pkmn/324_s.png
new file mode 100644
index 000000000..118e3785c
Binary files /dev/null and b/images/pkmn/324_s.png differ
diff --git a/images/pkmn/325_s.png b/images/pkmn/325_s.png
new file mode 100644
index 000000000..6c85ef300
Binary files /dev/null and b/images/pkmn/325_s.png differ
diff --git a/images/pkmn/326_s.png b/images/pkmn/326_s.png
new file mode 100644
index 000000000..f6c1e99ca
Binary files /dev/null and b/images/pkmn/326_s.png differ
diff --git a/images/pkmn/3271_.png b/images/pkmn/3271_.png
new file mode 100644
index 000000000..211a2cd5c
Binary files /dev/null and b/images/pkmn/3271_.png differ
diff --git a/images/pkmn/3271_s.png b/images/pkmn/3271_s.png
new file mode 100644
index 000000000..59006a4cf
Binary files /dev/null and b/images/pkmn/3271_s.png differ
diff --git a/images/pkmn/3272_.png b/images/pkmn/3272_.png
new file mode 100644
index 000000000..7cf52b27c
Binary files /dev/null and b/images/pkmn/3272_.png differ
diff --git a/images/pkmn/3272_s.png b/images/pkmn/3272_s.png
new file mode 100644
index 000000000..5b570f875
Binary files /dev/null and b/images/pkmn/3272_s.png differ
diff --git a/images/pkmn/3273_.png b/images/pkmn/3273_.png
new file mode 100644
index 000000000..c20a28a0f
Binary files /dev/null and b/images/pkmn/3273_.png differ
diff --git a/images/pkmn/3273_s.png b/images/pkmn/3273_s.png
new file mode 100644
index 000000000..8ace58ed7
Binary files /dev/null and b/images/pkmn/3273_s.png differ
diff --git a/images/pkmn/3274_.png b/images/pkmn/3274_.png
new file mode 100644
index 000000000..9e603d60c
Binary files /dev/null and b/images/pkmn/3274_.png differ
diff --git a/images/pkmn/3274_s.png b/images/pkmn/3274_s.png
new file mode 100644
index 000000000..893b2f7ff
Binary files /dev/null and b/images/pkmn/3274_s.png differ
diff --git a/images/pkmn/3275_.png b/images/pkmn/3275_.png
new file mode 100644
index 000000000..5485282c0
Binary files /dev/null and b/images/pkmn/3275_.png differ
diff --git a/images/pkmn/3275_s.png b/images/pkmn/3275_s.png
new file mode 100644
index 000000000..4b7d224eb
Binary files /dev/null and b/images/pkmn/3275_s.png differ
diff --git a/images/pkmn/3276_.png b/images/pkmn/3276_.png
new file mode 100644
index 000000000..371e5ea45
Binary files /dev/null and b/images/pkmn/3276_.png differ
diff --git a/images/pkmn/3276_s.png b/images/pkmn/3276_s.png
new file mode 100644
index 000000000..326c7ebb5
Binary files /dev/null and b/images/pkmn/3276_s.png differ
diff --git a/images/pkmn/3277_.png b/images/pkmn/3277_.png
new file mode 100644
index 000000000..db5f4d8f3
Binary files /dev/null and b/images/pkmn/3277_.png differ
diff --git a/images/pkmn/3277_s.png b/images/pkmn/3277_s.png
new file mode 100644
index 000000000..4ff5ca110
Binary files /dev/null and b/images/pkmn/3277_s.png differ
diff --git a/images/pkmn/3278_.png b/images/pkmn/3278_.png
new file mode 100644
index 000000000..41a2011f3
Binary files /dev/null and b/images/pkmn/3278_.png differ
diff --git a/images/pkmn/3278_s.png b/images/pkmn/3278_s.png
new file mode 100644
index 000000000..c5f08b5cb
Binary files /dev/null and b/images/pkmn/3278_s.png differ
diff --git a/images/pkmn/328_s.png b/images/pkmn/328_s.png
new file mode 100644
index 000000000..9fde677ce
Binary files /dev/null and b/images/pkmn/328_s.png differ
diff --git a/images/pkmn/329_s.png b/images/pkmn/329_s.png
new file mode 100644
index 000000000..9fefe86b7
Binary files /dev/null and b/images/pkmn/329_s.png differ
diff --git a/images/pkmn/330_s.png b/images/pkmn/330_s.png
new file mode 100644
index 000000000..9fee8b1ce
Binary files /dev/null and b/images/pkmn/330_s.png differ
diff --git a/images/pkmn/331_s.png b/images/pkmn/331_s.png
new file mode 100644
index 000000000..749b4c226
Binary files /dev/null and b/images/pkmn/331_s.png differ
diff --git a/images/pkmn/332_s.png b/images/pkmn/332_s.png
new file mode 100644
index 000000000..e5d43c519
Binary files /dev/null and b/images/pkmn/332_s.png differ
diff --git a/images/pkmn/333_s.png b/images/pkmn/333_s.png
new file mode 100644
index 000000000..397a54b79
Binary files /dev/null and b/images/pkmn/333_s.png differ
diff --git a/images/pkmn/334_s.png b/images/pkmn/334_s.png
new file mode 100644
index 000000000..a363ea588
Binary files /dev/null and b/images/pkmn/334_s.png differ
diff --git a/images/pkmn/335_s.png b/images/pkmn/335_s.png
new file mode 100644
index 000000000..c699c3075
Binary files /dev/null and b/images/pkmn/335_s.png differ
diff --git a/images/pkmn/336_s.png b/images/pkmn/336_s.png
new file mode 100644
index 000000000..a1b7cf316
Binary files /dev/null and b/images/pkmn/336_s.png differ
diff --git a/images/pkmn/337_s.png b/images/pkmn/337_s.png
new file mode 100644
index 000000000..5f027ffad
Binary files /dev/null and b/images/pkmn/337_s.png differ
diff --git a/images/pkmn/338_s.png b/images/pkmn/338_s.png
new file mode 100644
index 000000000..a2a19235c
Binary files /dev/null and b/images/pkmn/338_s.png differ
diff --git a/images/pkmn/339_s.png b/images/pkmn/339_s.png
new file mode 100644
index 000000000..d488b490d
Binary files /dev/null and b/images/pkmn/339_s.png differ
diff --git a/images/pkmn/340_s.png b/images/pkmn/340_s.png
new file mode 100644
index 000000000..f69634d00
Binary files /dev/null and b/images/pkmn/340_s.png differ
diff --git a/images/pkmn/341_s.png b/images/pkmn/341_s.png
new file mode 100644
index 000000000..ff3fe9d60
Binary files /dev/null and b/images/pkmn/341_s.png differ
diff --git a/images/pkmn/342_s.png b/images/pkmn/342_s.png
new file mode 100644
index 000000000..bf47f58c0
Binary files /dev/null and b/images/pkmn/342_s.png differ
diff --git a/images/pkmn/343_s.png b/images/pkmn/343_s.png
new file mode 100644
index 000000000..dc4da78b3
Binary files /dev/null and b/images/pkmn/343_s.png differ
diff --git a/images/pkmn/344_s.png b/images/pkmn/344_s.png
new file mode 100644
index 000000000..d952cedaa
Binary files /dev/null and b/images/pkmn/344_s.png differ
diff --git a/images/pkmn/345_s.png b/images/pkmn/345_s.png
new file mode 100644
index 000000000..b13d0a393
Binary files /dev/null and b/images/pkmn/345_s.png differ
diff --git a/images/pkmn/346_s.png b/images/pkmn/346_s.png
new file mode 100644
index 000000000..85122fed6
Binary files /dev/null and b/images/pkmn/346_s.png differ
diff --git a/images/pkmn/347_s.png b/images/pkmn/347_s.png
new file mode 100644
index 000000000..b74bc14d1
Binary files /dev/null and b/images/pkmn/347_s.png differ
diff --git a/images/pkmn/348_s.png b/images/pkmn/348_s.png
new file mode 100644
index 000000000..d76451269
Binary files /dev/null and b/images/pkmn/348_s.png differ
diff --git a/images/pkmn/349_s.png b/images/pkmn/349_s.png
new file mode 100644
index 000000000..8ff8768b8
Binary files /dev/null and b/images/pkmn/349_s.png differ
diff --git a/images/pkmn/350_s.png b/images/pkmn/350_s.png
new file mode 100644
index 000000000..175cb3154
Binary files /dev/null and b/images/pkmn/350_s.png differ
diff --git a/images/pkmn/351normal_.png b/images/pkmn/351normal_.png
new file mode 100644
index 000000000..350760909
Binary files /dev/null and b/images/pkmn/351normal_.png differ
diff --git a/images/pkmn/351normal_s.png b/images/pkmn/351normal_s.png
new file mode 100644
index 000000000..768b3d0cc
Binary files /dev/null and b/images/pkmn/351normal_s.png differ
diff --git a/images/pkmn/351rainy_.png b/images/pkmn/351rainy_.png
new file mode 100644
index 000000000..e62060cdb
Binary files /dev/null and b/images/pkmn/351rainy_.png differ
diff --git a/images/pkmn/351rainy_s.png b/images/pkmn/351rainy_s.png
new file mode 100644
index 000000000..c92c24a75
Binary files /dev/null and b/images/pkmn/351rainy_s.png differ
diff --git a/images/pkmn/351snowy_.png b/images/pkmn/351snowy_.png
new file mode 100644
index 000000000..7e9b028ae
Binary files /dev/null and b/images/pkmn/351snowy_.png differ
diff --git a/images/pkmn/351snowy_s.png b/images/pkmn/351snowy_s.png
new file mode 100644
index 000000000..35bb11048
Binary files /dev/null and b/images/pkmn/351snowy_s.png differ
diff --git a/images/pkmn/351sunny_.png b/images/pkmn/351sunny_.png
new file mode 100644
index 000000000..374dc8ced
Binary files /dev/null and b/images/pkmn/351sunny_.png differ
diff --git a/images/pkmn/351sunny_s.png b/images/pkmn/351sunny_s.png
new file mode 100644
index 000000000..39920aad0
Binary files /dev/null and b/images/pkmn/351sunny_s.png differ
diff --git a/images/pkmn/353_s.png b/images/pkmn/353_s.png
new file mode 100644
index 000000000..a3542ae8c
Binary files /dev/null and b/images/pkmn/353_s.png differ
diff --git a/images/pkmn/354_s.png b/images/pkmn/354_s.png
new file mode 100644
index 000000000..cd019e0f3
Binary files /dev/null and b/images/pkmn/354_s.png differ
diff --git a/images/pkmn/355_s.png b/images/pkmn/355_s.png
new file mode 100644
index 000000000..dac1a3076
Binary files /dev/null and b/images/pkmn/355_s.png differ
diff --git a/images/pkmn/356_s.png b/images/pkmn/356_s.png
new file mode 100644
index 000000000..f1911d2d5
Binary files /dev/null and b/images/pkmn/356_s.png differ
diff --git a/images/pkmn/357_s.png b/images/pkmn/357_s.png
new file mode 100644
index 000000000..24b8fd5b6
Binary files /dev/null and b/images/pkmn/357_s.png differ
diff --git a/images/pkmn/358_s.png b/images/pkmn/358_s.png
new file mode 100644
index 000000000..dcb7752a1
Binary files /dev/null and b/images/pkmn/358_s.png differ
diff --git a/images/pkmn/359_s.png b/images/pkmn/359_s.png
new file mode 100644
index 000000000..463ef8132
Binary files /dev/null and b/images/pkmn/359_s.png differ
diff --git a/images/pkmn/360_s.png b/images/pkmn/360_s.png
new file mode 100644
index 000000000..27a4d0974
Binary files /dev/null and b/images/pkmn/360_s.png differ
diff --git a/images/pkmn/361_s.png b/images/pkmn/361_s.png
new file mode 100644
index 000000000..96516ba50
Binary files /dev/null and b/images/pkmn/361_s.png differ
diff --git a/images/pkmn/362_s.png b/images/pkmn/362_s.png
new file mode 100644
index 000000000..33960e747
Binary files /dev/null and b/images/pkmn/362_s.png differ
diff --git a/images/pkmn/363_s.png b/images/pkmn/363_s.png
new file mode 100644
index 000000000..aa0ee8406
Binary files /dev/null and b/images/pkmn/363_s.png differ
diff --git a/images/pkmn/364_s.png b/images/pkmn/364_s.png
new file mode 100644
index 000000000..fb85002a5
Binary files /dev/null and b/images/pkmn/364_s.png differ
diff --git a/images/pkmn/365_s.png b/images/pkmn/365_s.png
new file mode 100644
index 000000000..a42760c1b
Binary files /dev/null and b/images/pkmn/365_s.png differ
diff --git a/images/pkmn/366_s.png b/images/pkmn/366_s.png
new file mode 100644
index 000000000..5f0dea07a
Binary files /dev/null and b/images/pkmn/366_s.png differ
diff --git a/images/pkmn/367_s.png b/images/pkmn/367_s.png
new file mode 100644
index 000000000..82a06cb3e
Binary files /dev/null and b/images/pkmn/367_s.png differ
diff --git a/images/pkmn/369_s.png b/images/pkmn/369_s.png
new file mode 100644
index 000000000..cd53f0730
Binary files /dev/null and b/images/pkmn/369_s.png differ
diff --git a/images/pkmn/370_s.png b/images/pkmn/370_s.png
new file mode 100644
index 000000000..2873e2603
Binary files /dev/null and b/images/pkmn/370_s.png differ
diff --git a/images/pkmn/371_s.png b/images/pkmn/371_s.png
new file mode 100644
index 000000000..029ace268
Binary files /dev/null and b/images/pkmn/371_s.png differ
diff --git a/images/pkmn/372_s.png b/images/pkmn/372_s.png
new file mode 100644
index 000000000..4a6d88b0d
Binary files /dev/null and b/images/pkmn/372_s.png differ
diff --git a/images/pkmn/373_s.png b/images/pkmn/373_s.png
new file mode 100644
index 000000000..a04147193
Binary files /dev/null and b/images/pkmn/373_s.png differ
diff --git a/images/pkmn/374_s.png b/images/pkmn/374_s.png
new file mode 100644
index 000000000..040420470
Binary files /dev/null and b/images/pkmn/374_s.png differ
diff --git a/images/pkmn/375_s.png b/images/pkmn/375_s.png
new file mode 100644
index 000000000..da48ab86a
Binary files /dev/null and b/images/pkmn/375_s.png differ
diff --git a/images/pkmn/376_s.png b/images/pkmn/376_s.png
new file mode 100644
index 000000000..f30b66555
Binary files /dev/null and b/images/pkmn/376_s.png differ
diff --git a/images/pkmn/377_s.png b/images/pkmn/377_s.png
new file mode 100644
index 000000000..9cf8f62e9
Binary files /dev/null and b/images/pkmn/377_s.png differ
diff --git a/images/pkmn/378_s.png b/images/pkmn/378_s.png
new file mode 100644
index 000000000..2cdaea253
Binary files /dev/null and b/images/pkmn/378_s.png differ
diff --git a/images/pkmn/379_s.png b/images/pkmn/379_s.png
new file mode 100644
index 000000000..6d26e06a6
Binary files /dev/null and b/images/pkmn/379_s.png differ
diff --git a/images/pkmn/380_s.png b/images/pkmn/380_s.png
new file mode 100644
index 000000000..44ca3a6f6
Binary files /dev/null and b/images/pkmn/380_s.png differ
diff --git a/images/pkmn/381_s.png b/images/pkmn/381_s.png
new file mode 100644
index 000000000..0664becd6
Binary files /dev/null and b/images/pkmn/381_s.png differ
diff --git a/images/pkmn/382_s.png b/images/pkmn/382_s.png
new file mode 100644
index 000000000..5ee7e1234
Binary files /dev/null and b/images/pkmn/382_s.png differ
diff --git a/images/pkmn/383_s.png b/images/pkmn/383_s.png
new file mode 100644
index 000000000..1e857a259
Binary files /dev/null and b/images/pkmn/383_s.png differ
diff --git a/images/pkmn/384_s.png b/images/pkmn/384_s.png
new file mode 100644
index 000000000..84a145a9c
Binary files /dev/null and b/images/pkmn/384_s.png differ
diff --git a/images/pkmn/385_s.png b/images/pkmn/385_s.png
new file mode 100644
index 000000000..767747a07
Binary files /dev/null and b/images/pkmn/385_s.png differ
diff --git a/images/pkmn/386attack_.png b/images/pkmn/386attack_.png
new file mode 100644
index 000000000..f866c4dba
Binary files /dev/null and b/images/pkmn/386attack_.png differ
diff --git a/images/pkmn/386attack_s.png b/images/pkmn/386attack_s.png
new file mode 100644
index 000000000..93512f38d
Binary files /dev/null and b/images/pkmn/386attack_s.png differ
diff --git a/images/pkmn/386defense_.png b/images/pkmn/386defense_.png
new file mode 100644
index 000000000..69d1478b0
Binary files /dev/null and b/images/pkmn/386defense_.png differ
diff --git a/images/pkmn/386defense_s.png b/images/pkmn/386defense_s.png
new file mode 100644
index 000000000..82caf7ca9
Binary files /dev/null and b/images/pkmn/386defense_s.png differ
diff --git a/images/pkmn/386normal_.png b/images/pkmn/386normal_.png
new file mode 100644
index 000000000..0cf193fb7
Binary files /dev/null and b/images/pkmn/386normal_.png differ
diff --git a/images/pkmn/386normal_s.png b/images/pkmn/386normal_s.png
new file mode 100644
index 000000000..c0193def2
Binary files /dev/null and b/images/pkmn/386normal_s.png differ
diff --git a/images/pkmn/386speed_.png b/images/pkmn/386speed_.png
new file mode 100644
index 000000000..6b087cd5b
Binary files /dev/null and b/images/pkmn/386speed_.png differ
diff --git a/images/pkmn/386speed_s.png b/images/pkmn/386speed_s.png
new file mode 100644
index 000000000..5512f1703
Binary files /dev/null and b/images/pkmn/386speed_s.png differ
diff --git a/install.py b/install.py
deleted file mode 100644
index 5448f58a4..000000000
--- a/install.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import subprocess
-import pip
-from sys import platform
-
-_apt_req_= [
-    "tesseract-ocr",
-    "tesseract-ocr-eng"
-]
-
-apt_cmd = "apt install "
-
-_pip_req_= [
-    "discord.py>=0.16.6",
-    "pillow>=4.2.1",
-    "requests>=2.18.4",
-    "pytesseract>=0.1.7",
-    "hastebin.py>=0.2",
-    "fuzzywuzzy>=0.15.1",
-    "python-dateutil>=2.6.1",
-    "dateparser>=0.6.0"
-]
-
-def apt_install(packages):
-    for package in packages:
-        cmd = apt_cmd+package
-        subprocess.run(cmd.split())
-        print("[+] Package {} Installed".format(str(package)))
-
-def pip_install(packages):
-    for package in packages:
-        pip.main(['install',package])
-
-if __name__ == '__main__':
-    print(str(platform))
-    if platform == "linux" or platform == "linux2":
-        apt_install(_apt_req_)
-    pip_install(_pip_req_)
-    if platform == "win32":
-        print("\n\nPlease install Tesseract OCR with the installer for Windows by visiting:\nhttps://github.com/tesseract-ocr/tesseract/wiki/Downloads")
-    if platform == "darwin":
-        print("\n\nPython packages installed. Please ensure Tesseract OCR for OSX is installed manually.")
-    print("\nRequirements installation is now complete.")
diff --git a/launcher.py b/launcher.py
index 5b2d34856..3076491fe 100644
--- a/launcher.py
+++ b/launcher.py
@@ -2,16 +2,23 @@
 
 import sys
 import os
+import time
 import subprocess
 import argparse
 
 #Launcher for Meowthv2
 
 def parse_cli_args():
-    parser = argparse.ArgumentParser(description="Meowth Launcher - Pokemon Go Bot for Discord")
-    parser.add_argument("--start","-s",help="Starts Meowth",action="store_true")
-    parser.add_argument("--auto-restart","-r",help="Auto-Restarts Meowth in case of a crash.",action="store_true")
-    parser.add_argument("--debug","-d",help="Prevents output being sent to Discord DM, as restarting could occur often.",action="store_true")
+    parser = argparse.ArgumentParser(
+        description="Meowth Launcher - Pokemon Go Bot for Discord")
+    parser.add_argument(
+        "--auto-restart", "-r",
+        help="Auto-Restarts Meowth in case of a crash.", action="store_true")
+    parser.add_argument(
+        "--debug", "-d",
+        help=("Prevents output being sent to Discord DM, "
+              "as restarting could occur often."),
+        action="store_true")
     return parser.parse_args()
 
 def run_meowth(autorestart):
@@ -19,7 +26,9 @@ def run_meowth(autorestart):
     if interpreter is None:
         raise RuntimeError("Python could not be found")
 
-    cmd = [interpreter, "meowth", "launcher"]
+    cmd = [interpreter, "-m", "meowth", "launcher"]
+
+    retries = 0
 
     while True:
         if args.debug:
@@ -34,6 +43,7 @@ def run_meowth(autorestart):
                 break
             elif code == 26:
                 #standard restart
+                retries = 0
                 print("")
                 print("Restarting Meowth")
                 print("")
@@ -41,9 +51,17 @@ def run_meowth(autorestart):
             else:
                 if not autorestart:
                     break
+                retries += 1
+                wait_time = min([retries^2, 60])
                 print("")
-                print("Restarting Meowth from crash")
+                print("Meowth experienced a crash.")
                 print("")
+                for i in range(wait_time, 0, -1):
+                    sys.stdout.write("\r")
+                    sys.stdout.write(
+                        "Restarting Meowth from crash in {:0d}".format(i))
+                    sys.stdout.flush()
+                    time.sleep(1)
 
     print("Meowth has closed. Exit code: {exit_code}".format(exit_code=code))
 
@@ -53,7 +71,5 @@ def run_meowth(autorestart):
     abspath = os.path.abspath(__file__)
     dirname = os.path.dirname(abspath)
     os.chdir(dirname)
-
-    if args.start:
-        print("Launching Meowth...")
-        run_meowth(autorestart=args.auto_restart)
+    print("Launching Meowth...")
+    run_meowth(autorestart=args.auto_restart)
diff --git a/logs/meowth_backup.log b/logs/meowth_backup.log
new file mode 100644
index 000000000..dba1ae6cb
--- /dev/null
+++ b/logs/meowth_backup.log
@@ -0,0 +1,166 @@
+2017-10-23 12:54:49,146:WARNING:discord.client: PyNaCl is not installed, voice will NOT be supported
+2017-10-23 12:54:49,146:INFO:discord.client: on_command_error has successfully been registered as an event
+2017-10-23 12:54:49,162:INFO:discord: Serverdict Loaded Successfully
+2017-10-23 12:54:49,162:INFO:discord.client: on_ready has successfully been registered as an event
+2017-10-23 12:54:49,162:INFO:discord.client: on_server_join has successfully been registered as an event
+2017-10-23 12:54:49,162:INFO:discord.client: on_server_remove has successfully been registered as an event
+2017-10-23 12:54:49,162:INFO:discord.client: on_member_join has successfully been registered as an event
+2017-10-23 12:54:49,162:INFO:discord.client: on_message has successfully been registered as an event
+2017-10-23 12:54:49,162:INFO:discord.client: logging in using static token
+2017-10-23 12:54:49,621:INFO:discord.gateway: Created websocket connected to wss://gateway.discord.gg?encoding=json&v=6
+2017-10-23 12:54:49,622:INFO:discord.gateway: sent the identify payload to create the websocket
+2017-10-23 12:54:51,694:INFO:discord: Starting up...
+2017-10-23 12:54:51,694:INFO:discord: Meowth! That's right!
+
+1 servers connected.
+14 members found.
+2017-10-23 12:54:51,694:INFO:discord: Maintenance Tasks Started
+2017-10-23 12:54:51,709:INFO:discord: Server_Cleanup ------ BEGIN ------
+2017-10-23 12:54:51,709:INFO:discord: Server_Cleanup - SAVING CHANGES
+2017-10-23 12:54:51,725:INFO:discord: Server_Cleanup ------ END ------
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-water-fall - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-water-fall - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-water-fall - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-blue-tile-fountain - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-blue-tile-fountain - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-blue-tile-fountain - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-marina-knucklebone - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-marina-knucklebone - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-marina-knucklebone - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-blood-in-the-water - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-blood-in-the-water - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-blood-in-the-water - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-5-egg-mt-olive-lutheran-church - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-5-egg-mt-olive-lutheran-church - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-5-egg-mt-olive-lutheran-church - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-3-egg-bronze-sculpture-group-at-comerica - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-3-egg-bronze-sculpture-group-at-comerica - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-3-egg-bronze-sculpture-group-at-comerica - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-3-egg-awesome-saw-sign - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-3-egg-awesome-saw-sign - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-3-egg-awesome-saw-sign - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-pono-burger - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-pono-burger - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-pono-burger - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-institute-of-religion - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-institute-of-religion - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-institute-of-religion - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-bicknell-ave-beach-mural - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-bicknell-ave-beach-mural - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-1-egg-bicknell-ave-beach-mural - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-giant-yogarat - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-giant-yogarat - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-giant-yogarat - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-5-egg-marina-del-rey-markers - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-5-egg-marina-del-rey-markers - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-5-egg-marina-del-rey-markers - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-flight-mural-2 - CHECKING
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-flight-mural-2 - EXISTS IN DISCORD
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go: Channel:level-2-egg-flight-mural-2 - = RECENTLY EXPIRED NONACTIVE RAID
+2017-10-23 12:54:51,740:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 12:54:51,756:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-1-egg-water-fall
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-1-egg-water-fall
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-2-egg-blue-tile-fountain
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-2-egg-blue-tile-fountain
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-2-egg-marina-knucklebone
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-2-egg-marina-knucklebone
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-1-egg-blood-in-the-water
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-1-egg-blood-in-the-water
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-5-egg-mt-olive-lutheran-church
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-5-egg-mt-olive-lutheran-church
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-3-egg-bronze-sculpture-group-at-comerica
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-3-egg-bronze-sculpture-group-at-comerica
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-3-egg-awesome-saw-sign
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-3-egg-awesome-saw-sign
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-1-egg-pono-burger
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-1-egg-pono-burger
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-2-egg-institute-of-religion
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-2-egg-institute-of-religion
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-1-egg-bicknell-ave-beach-mural
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-1-egg-bicknell-ave-beach-mural
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-2-egg-giant-yogarat
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-2-egg-giant-yogarat
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-5-egg-marina-del-rey-markers
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-5-egg-marina-del-rey-markers
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - level-2-egg-flight-mural-2
+2017-10-23 12:54:51,756:INFO:discord: Expire_Channel - Channel Expired - level-2-egg-flight-mural-2
+2017-10-23 13:03:54,322:INFO:discord: Expire_Channel - Channel Deleted - level-1-egg-water-fall
+2017-10-23 13:03:58,992:INFO:discord: Expire_Channel - Channel Deleted - level-2-egg-blue-tile-fountain
+2017-10-23 13:03:59,926:INFO:discord: Expire_Channel - Channel Deleted - level-2-egg-marina-knucklebone
+2017-10-23 13:04:01,286:INFO:discord: Expire_Channel - Channel Deleted - level-1-egg-blood-in-the-water
+2017-10-23 13:04:02,232:INFO:discord: Expire_Channel - Channel Deleted - level-5-egg-mt-olive-lutheran-church
+2017-10-23 13:04:02,512:INFO:discord: Expire_Channel - Channel Deleted - level-3-egg-bronze-sculpture-group-at-comerica
+2017-10-23 13:04:05,630:INFO:discord: Expire_Channel - Channel Deleted - level-3-egg-awesome-saw-sign
+2017-10-23 13:04:15,119:INFO:discord: Expire_Channel - Channel Deleted - level-1-egg-pono-burger
+2017-10-23 13:04:17,236:INFO:discord: Expire_Channel - Channel Deleted - level-2-egg-institute-of-religion
+2017-10-23 13:04:18,641:INFO:discord: Expire_Channel - Channel Deleted - level-1-egg-bicknell-ave-beach-mural
+2017-10-23 13:04:22,201:INFO:discord: Expire_Channel - Channel Deleted - level-2-egg-giant-yogarat
+2017-10-23 13:04:23,569:INFO:discord: Expire_Channel - Channel Deleted - level-5-egg-marina-del-rey-markers
+2017-10-23 13:04:25,226:INFO:discord: Expire_Channel - Channel Deleted - level-2-egg-flight-mural-2
+2017-10-23 13:04:51,757:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 13:04:51,757:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 13:04:51,757:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 13:04:51,773:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 13:14:51,764:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 13:14:51,764:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 13:14:51,764:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 13:14:51,786:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 13:24:51,738:INFO:discord: Server_Cleanup ------ BEGIN ------
+2017-10-23 13:24:51,740:INFO:discord: Server_Cleanup - SAVING CHANGES
+2017-10-23 13:24:51,752:INFO:discord: Server_Cleanup ------ END ------
+2017-10-23 13:24:51,796:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 13:24:51,796:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 13:24:51,797:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 13:24:51,839:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 13:34:51,851:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 13:34:51,851:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 13:34:51,851:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 13:34:51,866:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 13:44:51,879:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 13:44:51,880:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 13:44:51,880:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 13:44:51,891:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 13:54:51,764:INFO:discord: Server_Cleanup ------ BEGIN ------
+2017-10-23 13:54:51,764:INFO:discord: Server_Cleanup - SAVING CHANGES
+2017-10-23 13:54:51,780:INFO:discord: Server_Cleanup ------ END ------
+2017-10-23 13:54:51,896:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 13:54:51,896:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 13:54:51,896:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 13:54:51,912:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 14:04:51,921:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 14:04:51,921:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 14:04:51,921:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 14:04:51,930:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 14:14:51,934:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 14:14:51,935:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 14:14:51,936:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 14:14:51,973:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 14:24:51,804:INFO:discord: Server_Cleanup ------ BEGIN ------
+2017-10-23 14:24:51,805:INFO:discord: Server_Cleanup - SAVING CHANGES
+2017-10-23 14:24:51,822:INFO:discord: Server_Cleanup ------ END ------
+2017-10-23 14:24:51,988:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 14:24:51,988:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 14:24:51,988:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 14:24:52,002:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 14:34:52,021:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 14:34:52,021:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 14:34:52,021:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 14:34:52,037:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 14:44:52,046:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 14:44:52,047:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 14:44:52,047:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 14:44:52,058:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 14:54:51,826:INFO:discord: Server_Cleanup ------ BEGIN ------
+2017-10-23 14:54:51,829:INFO:discord: Server_Cleanup - SAVING CHANGES
+2017-10-23 14:54:51,839:INFO:discord: Server_Cleanup ------ END ------
+2017-10-23 14:54:52,081:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 14:54:52,081:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 14:54:52,081:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 14:54:52,090:INFO:discord: Channel_Cleanup ------ END ------
+2017-10-23 15:04:52,112:INFO:discord: Channel_Cleanup ------ BEGIN ------
+2017-10-23 15:04:52,112:INFO:discord: Channel_Cleanup - Server: TEST WV Pokemon Go - BEGIN CHECKING SERVER
+2017-10-23 15:04:52,112:INFO:discord: Channel_Cleanup - SAVING CHANGES
+2017-10-23 15:04:52,121:INFO:discord: Channel_Cleanup ------ END ------
diff --git a/meowth/__main__.py b/meowth/__main__.py
index 4dcfb671d..737e34adb 100644
--- a/meowth/__main__.py
+++ b/meowth/__main__.py
@@ -1,47 +1,42 @@
-import os
-import sys
-import tempfile
+
 import asyncio
-import gettext
-import re
-import pickle
-import json
-import time
-import datetime
-from dateutil.relativedelta import relativedelta
-from dateutil import tz
 import copy
-from time import strftime
-from logs import init_loggers
-import discord
-from discord.ext import commands
-import pkmn_match
-from PIL import Image
-from PIL import ImageFilter
-from PIL import ImageEnhance
-import pytesseract
-import aiohttp
-import urllib
+import datetime
 import functools
+import gettext
+import io
+import json
+import os
+import pickle
+import re
+import sys
+import tempfile
 import textwrap
+import time
+import traceback
+
+from contextlib import redirect_stdout
 from io import BytesIO
-import checks
-import hastebin
 from operator import itemgetter
-from errors import custom_error_handling
+from time import strftime
+
+import aiohttp
 import dateparser
-import io
-import traceback
-from contextlib import redirect_stdout
+import hastebin
+from dateutil import tz
+from dateutil.relativedelta import relativedelta
 
-tessdata_dir_config = "--tessdata-dir 'C:\\Program Files (x86)\\Tesseract-OCR\\tessdata' "
-xtraconfig = '-l eng -c tessedit_char_blacklist=&|=+%#^*[]{};<> -psm 6'
-if os.name == 'nt':
-    tesseract_config = tessdata_dir_config + xtraconfig
-else:
-    tesseract_config = xtraconfig
-logger = init_loggers()
+import discord
+from discord.ext import commands
 
+from meowth import checks
+from meowth import pkmn_match
+from meowth import utils
+from meowth.bot import MeowthBot
+from meowth.errors import custom_error_handling
+from meowth.logs import init_loggers
+
+logger = init_loggers()
 
 def _get_prefix(bot, message):
     guild = message.guild
@@ -51,9 +46,11 @@ def _get_prefix(bot, message):
         prefix = None
     if not prefix:
         prefix = bot.config['default_prefix']
-    return commands.when_mentioned_or(prefix)(bot,message)
+    return commands.when_mentioned_or(prefix)(bot, message)
 
-Meowth = commands.Bot(command_prefix=_get_prefix, case_insensitive=True, activity=discord.Game(name="Pokemon Go"))
+Meowth = MeowthBot(
+    command_prefix=_get_prefix, case_insensitive=True,
+    activity=discord.Game(name="Pokemon Go"))
 
 custom_error_handling(Meowth, logger)
 try:
@@ -85,18 +82,17 @@ def _get_prefix(bot, message):
 type_list = []
 raid_info = {}
 
-
 active_raids = []
 active_wilds = []
 # Append path of this script to the path of
 # config files which we're loading.
 # Assumes that config files will always live in the same directory.
 script_path = os.path.dirname(os.path.realpath(__file__))
-
 """
 Helper functions
 """
 
+
 def load_config():
     global config
     global pkmn_info
@@ -107,16 +103,17 @@ def load_config():
     with open('config.json', 'r') as fd:
         config = json.load(fd)
     # Set up message catalog access
-    language = gettext.translation('meowth', localedir='locale', languages=[
-                                   config['bot-language']])
+    language = gettext.translation(
+        'meowth', localedir='locale', languages=[config['bot-language']])
     language.install()
     pokemon_language = [config['pokemon-language']]
     pokemon_path_source = os.path.join(
         'locale', '{0}', 'pkmn.json').format(config['pokemon-language'])
+    raid_path_source = os.path.join('data', 'raid_info.json')
     # Load Pokemon list and raid info
     with open(pokemon_path_source, 'r') as fd:
         pkmn_info = json.load(fd)
-    with open(os.path.join('data', 'raid_info.json'), 'r') as fd:
+    with open(raid_path_source, 'r') as fd:
         raid_info = json.load(fd)
     # Load type information
     with open(os.path.join('data', 'type_chart.json'), 'r') as fd:
@@ -125,15 +122,56 @@ def load_config():
         type_list = json.load(fd)
     # Set spelling dictionary to our list of Pokemon
     pkmn_match.set_list(pkmn_info['pokemon_list'])
+    return (pokemon_path_source, raid_path_source)
 
+pkmn_path, raid_path = load_config()
+
+Meowth.pkmn_info = pkmn_info
+Meowth.raid_info = raid_info
+Meowth.type_list = type_list
+Meowth.type_chart = type_chart
 
-load_config()
 Meowth.config = config
+Meowth.pkmn_info_path = pkmn_path
+Meowth.raid_json_path = raid_path
+
+default_exts = ['datahandler', 'tutorial', 'silph', 'utilities', 'pokemon', 'trade']
+
+for ext in default_exts:
+    try:
+        Meowth.load_extension(f"meowth.exts.{ext}")
+    except Exception as e:
+        print(f'**Error when loading extension {ext}:**\n{type(e).__name__}: {e}')
+    else:
+        if 'debug' in sys.argv[1:]:
+            print(f'Loaded {ext} extension.')
+
+@Meowth.command(name='load')
+@checks.is_owner()
+async def _load(ctx, *extensions):
+    for ext in extensions:
+        try:
+            ctx.bot.unload_extension(f"meowth.exts.{ext}")
+            ctx.bot.load_extension(f"meowth.exts.{ext}")
+        except Exception as e:
+            error_title = _('**Error when loading extension')
+            await ctx.send(f'{error_title} {ext}:**\n'
+                           f'{type(e).__name__}: {e}')
+        else:
+            await ctx.send(_('**Extension {ext} Loaded.**\n').format(ext=ext))
+
+@Meowth.command(name='unload')
+@checks.is_owner()
+async def _unload(ctx, *extensions):
+    exts = [e for e in extensions if f"exts.{e}" in Meowth.extensions]
+    for ext in exts:
+        ctx.bot.unload_extension(f"exts.{ext}")
+    s = 's' if len(exts) > 1 else ''
+    await ctx.send(_("**Extension{plural} {est} unloaded.**\n").format(plural=s, est=', '.join(exts)))
 
 # Given a Pokemon name, return a list of its
 # weaknesses as defined in the type chart
 
-
 def get_type(guild, pkmn_number):
     pkmn_number = int(pkmn_number) - 1
     types = type_list[pkmn_number]
@@ -160,11 +198,11 @@ def get_number(pkm_name):
 def get_level(pkmn):
     if str(pkmn).isdigit():
         pkmn_number = pkmn
-    elif (not str(pkmn).isdigit()):
+    else:
         pkmn_number = get_number(pkmn)
     for level in raid_info['raid_eggs']:
-        for pokemon in raid_info['raid_eggs'][level]['pokemon']:
-            if pokemon == pkmn_number:
+        for level, pkmn_list in raid_info['raid_eggs'].items():
+            if pkmn_number in pkmn_list["pokemon"]:
                 return level
 
 def get_raidlist():
@@ -394,6 +432,33 @@ def check(reaction, user):
         await message.clear_reactions()
         return
 
+def get_gyms(guild_id):
+    gym_matching_cog = Meowth.cogs.get('GymMatching')
+    if not gym_matching_cog:
+        return None
+    gyms = gym_matching_cog.get_gyms(guild_id)
+    return gyms
+
+async def gym_match_prompt(channel, author_id, gym_name, gyms):
+    gym_matching_cog = Meowth.cogs.get('GymMatching')
+    match, score = gym_matching_cog.gym_match(gym_name, gyms)
+    if not match:
+        return None
+    if score < 80:
+        try:
+            question = _("Did you mean: '{0}'").format(match)
+            q_msg = await channel.send(question)
+            reaction, __ = await ask(q_msg, channel, author_id)
+        except TypeError:
+            return None
+        if not reaction:
+            return None
+        if reaction.emoji == '✅':
+            await q_msg.delete()
+            return match
+        return None
+    return match
+
 async def letter_case(iterable, find, *, limits=None):
     servercase_list = []
     lowercase_list = []
@@ -409,12 +474,12 @@ async def letter_case(iterable, find, *, limits=None):
     else:
         return None
 
-def get_category(channel, level, type="raid"):
+def get_category(channel, level, category_type="raid"):
     guild = channel.guild
-    if type == "raid" or type == "egg":
+    if category_type == "raid" or category_type == "egg":
         report = "raid"
     else:
-        report = type
+        report = category_type
     catsort = guild_dict[guild.id]['configure_dict'][report].get('categories', None)
     if catsort == "same":
         return channel.category
@@ -427,13 +492,6 @@ def get_category(channel, level, type="raid"):
     else:
         return None
 
-async def get_raidhelp(user):
-    helpembed = discord.Embed(colour=discord.Colour.lighter_grey()).set_author(name="Raid Coordination Help", icon_url=Meowth.user.avatar_url)
-    helpembed.add_field(name="Key", value="<> denote required arguments, [] denote optional arguments", inline=False)
-    helpembed.add_field(name="Raid MGMT Commands", value="`!raid <species>`\n`!weather <weather>`\n`!timerset <minutes>`\n`!starttime <time>`\n`<google maps link>`\n**RSVP**\n`!(i/c/h)...\n[total]...\n[team counts]`\n\n`!starting [team]`")
-    helpembed.add_field(name="Description", value="`Hatches Egg channel`\n`Sets in-game weather`\n`Sets hatch/raid timer`\n`Sets start time`\n`Updates raid location`\n\n`interested/coming/here`\n`# of trainers`\n`# from each team (ex. 3m for 3 Mystic)`\n\n`Moves [team] trainers (all trainers if [team] omitted) on 'here' list to a lobby.`")
-    await user.send(embed=helpembed)
-
 def get_raidtext(type, pkmn, level, member, channel):
     if type == "raid":
         roletest = ""
@@ -450,7 +508,7 @@ def get_raidtext(type, pkmn, level, member, channel):
 async def create_raid_channel(type, pkmn, level, details, report_channel):
     guild = report_channel.guild
     if type == "exraid":
-        name = "exraid-egg-"
+        name = _("exraid-egg-")
         raid_channel_overwrite_list = channel.overwrites
         if guild_dict[guild.id]['configure_dict']['invite']['enabled']:
             if guild_dict[guild.id]['configure_dict']['exraid']['permissions'] == "everyone":
@@ -481,11 +539,12 @@ async def create_raid_channel(type, pkmn, level, details, report_channel):
     elif type == "raid":
         name = pkmn + "-"
         raid_channel_overwrite_list = report_channel.overwrites
+        level = get_level(pkmn)
     elif type == "egg":
-        name = str(level) + "-egg-"
+        name = _("level-{level}-egg-").format(level=str(level))
         raid_channel_overwrite_list = report_channel.overwrites
     name += sanitize_channel_name(details)
-    cat = get_category(report_channel, level, type=type)
+    cat = get_category(report_channel, str(level), category_type=type)
     ow = dict(raid_channel_overwrite_list)
     return await guild.create_text_channel(name, overwrites=ow, category=cat)
 
@@ -677,7 +736,7 @@ async def expire_channel(channel):
                 await channel.edit(name=new_name)
                 await channel.send(_('This channel timer has expired! The channel has been deactivated and will be deleted in 5 minutes.\nTo reactivate the channel, use **!timerset** to set the timer again.'))
             delete_time = (guild_dict[guild.id]['raidchannel_dict'][channel.id]['exp'] + (5 * 60)) - time.time()
-            raidtype = "event" if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else " raid"
+            raidtype = _("event") if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else _(" raid")
             expiremsg = _('**This {pokemon}{raidtype} has expired!**').format(
                 pokemon=guild_dict[channel.guild.id]['raidchannel_dict'][channel.id]['pokemon'].capitalize(), raidtype=raidtype)
         await asyncio.sleep(delete_time)
@@ -692,7 +751,7 @@ async def expire_channel(channel):
                             guild_dict[guild.id]['raidchannel_dict'][channel.id]['reportcity'])
                         reportmsg = await report_channel.get_message(guild_dict[channel.guild.id]['raidchannel_dict'][channel.id]['raidreport'])
                         await reportmsg.delete()
-                    except (discord.errors.NotFound, discord.errors.Forbidden, discord.errors.HTTPException):
+                    except:
                         pass
                 else:
                     try:
@@ -700,15 +759,15 @@ async def expire_channel(channel):
                             guild_dict[guild.id]['raidchannel_dict'][channel.id]['reportcity'])
                         reportmsg = await report_channel.get_message(guild_dict[channel.guild.id]['raidchannel_dict'][channel.id]['raidreport'])
                         await reportmsg.edit(embed=discord.Embed(description=expiremsg, colour=channel.guild.me.colour))
-                    except (discord.errors.NotFound, discord.errors.Forbidden, discord.errors.HTTPException):
+                    except:
                         pass
                     # channel doesn't exist anymore in serverdict
                 archive = guild_dict[guild.id]['raidchannel_dict'][channel.id].get('archive',False)
-                logs = guild_dict[guild.id]['raidchannel_dict'][channel.id].get('logs', {})
+                logs = guild_dict[channel.guild.id]['raidchannel_dict'][channel.id].get('logs', {})
                 channel_exists = Meowth.get_channel(channel.id)
                 if channel_exists == None:
                     return
-                elif gymhuntrdupe == False and archive == False:
+                elif not gymhuntrdupe and not archive and not logs:
                     try:
                         del guild_dict[channel.guild.id]['raidchannel_dict'][channel.id]
                     except KeyError:
@@ -716,7 +775,7 @@ async def expire_channel(channel):
                     await channel_exists.delete()
                     logger.info(
                         'Expire_Channel - Channel Deleted - ' + channel.name)
-                elif gymhuntrdupe == True and archive == False:
+                elif gymhuntrdupe and not archive:
                     for overwrite in channel.overwrites:
                         try:
                             await channel.set_permissions(channel.guild.default_role, overwrite=discord.PermissionOverwrite(read_messages=False))
@@ -744,8 +803,8 @@ async def expire_channel(channel):
                             if (overwrite[0].name not in guild.me.top_role.name) and (overwrite[0].name not in guild.me.name):
                                 await channel.set_permissions(overwrite[0], read_messages=False)
                         for role in guild.role_hierarchy:
-                            if role.permissions.manage_guild or role.permissions.manage_channels or role.permissions.manage_messages:
-                                await channel.set_permissions(role, read_messages=True, manage_channels=True)
+                            if role.permissions.manage_guild or role.permissions.manage_channels:
+                                await channel.set_permissions(role, read_messages=True)
                             continue
                         await channel.set_permissions(guild.default_role, read_messages=False)
                     except (discord.errors.Forbidden, discord.errors.HTTPException, discord.errors.InvalidArgument):
@@ -774,6 +833,8 @@ async def expire_channel(channel):
         except:
             pass
 
+Meowth.expire_channel = expire_channel
+
 async def channel_cleanup(loop=True):
     while (not Meowth.is_closed()):
         global active_raids
@@ -933,29 +994,32 @@ async def message_cleanup(loop=True):
             report_delete_dict = {}
             for report_dict in report_dict_dict:
                 for reportid in report_dict_dict[report_dict].keys():
-                    if report_dict_dict[report_dict][reportid]['exp'] <= time.time():
-                        report_channel = Meowth.get_channel(report_dict_dict[report_dict][reportid]['reportchannel'])
+                    if report_dict_dict[report_dict][reportid].get('exp', 0) <= time.time():
+                        report_channel = Meowth.get_channel(report_dict_dict[report_dict][reportid].get('reportchannel'))
                         if report_channel:
                             user_report = report_dict_dict[report_dict][reportid].get('reportmessage',None)
                             if user_report:
                                 report_delete_dict[user_report] = {"action":"delete","channel":report_channel}
-                            if report_dict_dict[report_dict][reportid]['expedit'] == "delete":
-                                report_delete_dict[reportid] = {"action":report_dict_dict[report_dict][reportid]['expedit'],"channel":report_channel}
+                            if report_dict_dict[report_dict][reportid].get('expedit') == "delete":
+                                report_delete_dict[reportid] = {"action":"delete","channel":report_channel}
                             else:
                                 report_edit_dict[reportid] = {"action":report_dict_dict[report_dict][reportid]['expedit'],"channel":report_channel}
-                        del guild_dict[guildid][report_dict][reportid]
+                        try:
+                            del guild_dict[guildid][report_dict][reportid]
+                        except KeyError:
+                            pass
             for messageid in report_delete_dict.keys():
                 try:
                     report_message = await report_delete_dict[messageid]['channel'].get_message(messageid)
                     await report_message.delete()
-                except (discord.errors.NotFound, discord.errors.Forbidden, discord.errors.HTTPException):
+                except (discord.errors.NotFound, discord.errors.Forbidden, discord.errors.HTTPException, KeyError):
                     pass
             for messageid in report_edit_dict.keys():
                 try:
                     report_message = await report_edit_dict[messageid]['channel'].get_message(messageid)
-                    await report_message.edit(content=report_edit_dict[messageid]['action']['content'],embed=discord.Embed(description=report_edit_dict[messageid]['action']['embedcontent'], colour=report_message.embeds[0].colour.value))
+                    await report_message.edit(content=report_edit_dict[messageid]['action']['content'],embed=discord.Embed(description=report_edit_dict[messageid]['action'].get('embedcontent'), colour=report_message.embeds[0].colour.value))
                     await report_message.clear_reactions()
-                except (discord.errors.NotFound, discord.errors.Forbidden, discord.errors.HTTPException):
+                except (discord.errors.NotFound, discord.errors.Forbidden, discord.errors.HTTPException, IndexError, KeyError):
                     pass
         # save server_dict changes after cleanup
         logger.info('message_cleanup - SAVING CHANGES')
@@ -994,13 +1058,12 @@ async def on_ready():
         Meowth.get_all_members(), id=config['master'])
     await _print(Meowth.owner, _('Starting up...'))
     Meowth.uptime = datetime.datetime.now()
-    owners = []
     msg_success = 0
     msg_fail = 0
     guilds = len(Meowth.guilds)
     users = 0
     for guild in Meowth.guilds:
-        users += len(guild.members)
+        users += guild.member_count
         try:
             if guild.id not in guild_dict:
                 guild_dict[guild.id] = {
@@ -1023,6 +1086,8 @@ async def on_ready():
                     'raidchannel_dict':{},
                     'trainers':{}
                 }
+            else:
+                guild_dict[guild.id]['configure_dict'].setdefault('trade', {})
         except KeyError:
             guild_dict[guild.id] = {
                 'configure_dict':{
@@ -1044,7 +1109,6 @@ async def on_ready():
                 'raidchannel_dict':{},
                 'trainers':{}
             }
-        owners.append(guild.owner)
     await _print(Meowth.owner, _("Meowth! That's right!\n\n{server_count} servers connected.\n{member_count} members found.").format(server_count=guilds, member_count=users))
     await maint_start()
 
@@ -1069,7 +1133,8 @@ async def on_guild_join(guild):
         'wildreport_dict:':{},
         'questreport_dict':{},
         'raidchannel_dict':{},
-        'trainers':{}
+        'trainers':{},
+        'trade_dict': {}
     }
     await owner.send(_("Meowth! I'm Meowth, a Discord helper bot for Pokemon Go communities, and someone has invited me to your server! Type **!help** to see a list of things I can do, and type **!configure** in any channel of your server to begin!"))
 
@@ -1197,289 +1262,25 @@ async def on_message(message):
     if (not message.author.bot):
         await Meowth.process_commands(message)
 
-async def on_huntr(message, reactuser=None):
-    timestamp = (message.created_at + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'])).strftime('%I:%M %p')
-    now = datetime.datetime.utcnow() + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'])
-    pokehuntr_dict = copy.deepcopy(guild_dict[guild.id].get('pokehuntr_dict',{}))
-    if not reactuser:
-        if message.embeds and (message.author.id == 329412230481444886 or message.author.id == 295116861920772098):
-            try:
-                huntrgps = message.embeds[0].url.split('#')[1]
-            except IndexError:
-                req = urllib.request.Request(message.embeds[0].url, headers={
-                    'User-Agent': 'Magic Browser',
-                })
-                con = urllib.request.urlopen(req)
-                try:
-                    huntrgps = con.geturl().split('#')[1]
-                    con.close()
-                except IndexError:
-                    source = str(con.read().decode('utf8').replace('\n', '').replace(' ', ''))
-                    sourceindex = source.find('huntr.com/#')
-                    newsourceindex = source.rfind('http', 0, sourceindex)
-                    newsourceend = source.find('"', newsourceindex)
-                    newsource = source[newsourceindex:newsourceend]
-                    huntrgps = newsource.split('#')[1]
-                    con.close()
-        if message.author.id == 329412230481444886 and message.embeds:
-            if (len(message.embeds[0].title.split(' ')) == 5) and guild_dict[message.guild.id]['configure_dict']['scanners']['autoraid']:
-                ghduplicate = False
-                ghraidlevel = message.embeds[0].title.split(' ')[1]
-                ghdesc = message.embeds[0].description.splitlines()
-                ghgym = ghdesc[0][2:(- 3)]
-                ghpokeid = ghdesc[1]
-                ghmoves = '\u200b'
-                if len(ghdesc[2].split()) > 3:
-                    ghmoves = ghdesc[2].split('**Moves:** ')[1]
-                ghtime = ghdesc[3].split(' ')
-                ghhour = ghtime[2]
-                ghminute = int(ghtime[4].zfill(2))
-                ghsec = int(ghtime[6].zfill(2))
-                huntr = '!raid {0} {1} {2}|{3}|{4}'.format(ghpokeid, ghgym, ghminute, huntrgps, ghmoves)
-                ghtimestamp = (message.created_at + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'], minutes=int(ghminute), seconds=int(ghsec))).strftime('%I:%M %p')
-                await message.delete()
-                for channelid in guild_dict[message.guild.id]['raidchannel_dict']:
-                    try:
-                        if guild_dict[message.guild.id]['raidchannel_dict'][channelid]['gymhuntrgps'] == huntrgps:
-                            ghduplicate = True
-                            channel = Meowth.get_channel(channelid)
-                            if guild_dict[message.guild.id]['raidchannel_dict'][channelid]['type'] == 'egg':
-                                await _eggtoraid(ghpokeid.lower().strip(), channel, author=message.author, huntr=huntr)
-                            raidmsg = await channel.get_message(guild_dict[message.guild.id]['raidchannel_dict'][channelid]['raidmessage'])
-                            if raidmsg.embeds[0].fields[2].name != ghmoves:
-                                await channel.send(_("This {pokemon}'s moves are: **{moves}**").format(pokemon=ghpokeid, moves=ghmoves))
-                    except KeyError:
-                        pass
-                if (ghduplicate == False) and (int(ghraidlevel) in guild_dict[message.guild.id]['configure_dict']['scanners']['raidlvls']):
-                    await _raid(message, content="",huntr=huntr)
-                elif (ghduplicate is False) and (int(ghraidlevel) not in guild_dict[message.guild.id]['configure_dict']['scanners']['raidlvls']):
-                    raid = discord.utils.get(message.guild.roles, name=ghpokeid.lower().strip())
-                    if raid is None:
-                        roletest = ""
-                    else:
-                        roletest = _("{pokemon} - ").format(pokemon=raid.mention)
-                    raid_embed = discord.Embed(title=_('Meowth! Click here for directions to the raid!'), url=_('https://www.google.com/maps/dir/Current+Location/{0}').format(huntrgps), colour=message.guild.me.colour)
-                    raid_number = pkmn_info['pokemon_list'].index(ghpokeid.lower().strip()) + 1
-                    raid_img_url = 'https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/pkmn/{0}_.png?cache=0'.format(str(raid_number).zfill(3))
-                    raid_embed.add_field(name='**Details:**', value=_('{pokemon} ({pokemonnumber}) {type}\n{moves}').format(pokemon=ghpokeid.title(), pokemonnumber=str(raid_number), type=''.join(get_type(message.guild, raid_number)), moves=ghmoves), inline=True)
-                    raid_embed.add_field(name='**Weaknesses:**', value=_('{weakness_list}').format(weakness_list=weakness_to_str(message.guild, get_weaknesses(ghpokeid.lower().strip()))), inline=True)
-                    raid_embed.add_field(name='**Location:**', value=_('{raid_details}').format(raid_details='\n'.join(textwrap.wrap(ghgym, width=30))), inline=True)
-                    raid_embed.add_field(name='**Expires in:**', value=_('{minutes} mins ({ghtimestamp})').format(minutes=ghminute, ghtimestamp=ghtimestamp), inline=True)
-                    raid_embed.set_thumbnail(url=raid_img_url)
-                    raid_embed.set_footer(text=_('Reported by @{author} - {timestamp}').format(author=message.author.display_name, timestamp=timestamp), icon_url=_('https://cdn.discordapp.com/avatars/{user.id}/{user.avatar}.{format}?size={size}'.format(user=message.author, format='jpg', size=32)))
-                    raidreport = await message.channel.send(content=_('{roletest}Meowth! {pokemon} raid reported by {member}! Details: {location_details}. React if you want to make a channel for this raid!').format(roletest=roletest,pokemon=ghpokeid.title(), member=message.author.mention, location_details=ghgym), embed=raid_embed)
-                    timeout = (int(ghminute) * 60)
-                    expiremsg = _('**This {pokemon} raid has expired!**').format(pokemon=ghpokeid)
-                    await asyncio.sleep(0.25)
-                    await raidreport.add_reaction('✅')
-                    pokehuntr_dict[raidreport.id] = {
-                        "exp":time.time() + timeout,
-                        'expedit': {"content":raidreport.content.split(" React")[0],"embedcontent":expiremsg},
-                        "reporttype":"raid",
-                        "reportchannel":message.channel.id,
-                        "level":0,
-                        "pokemon":ghpokeid,
-                        "reporttime":now,
-                        "huntr":huntr,
-                        "embed":raid_embed
-                    }
-                    guild_dict[message.guild.id]['pokehuntr_dict'] = pokehuntr_dict
-                    return
-            elif (len(message.embeds[0].title.split(' ')) == 6) and guild_dict[message.guild.id]['configure_dict']['scanners']['autoegg']:
-                ghduplicate = False
-                ghegglevel = message.embeds[0].title.split(' ')[1]
-                ghdesc = message.embeds[0].description.splitlines()
-                ghgym = ghdesc[0][2:(- 3)]
-                ghtime = ghdesc[1].split(' ')
-                ghhour = ghtime[2]
-                ghminute = int(ghtime[4].zfill(2))
-                ghsec = int(ghtime[4].zfill(2))
-                huntr = '!raidegg {0} {1} {2}|{3}'.format(ghegglevel, ghgym, ghminute, huntrgps)
-                ghtimestamp = (message.created_at + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'], minutes=int(ghminute), seconds=int(ghsec))).strftime('%I:%M %p')
-                await message.delete()
-                for channelid in guild_dict[message.guild.id]['raidchannel_dict']:
-                    try:
-                        if guild_dict[message.guild.id]['raidchannel_dict'][channelid]['gymhuntrgps'] == huntrgps:
-                            ghduplicate = True
-                            break
-                    except KeyError:
-                        pass
-                if (ghduplicate == False) and (int(ghegglevel) in guild_dict[message.guild.id]['configure_dict']['scanners']['egglvls']):
-                    await _raidegg(message, content="",huntr=huntr)
-                elif (ghduplicate is False) and (int(ghegglevel) not in guild_dict[message.guild.id]['configure_dict']['scanners']['egglvls']):
-                    raid_embed = discord.Embed(title=_('Meowth! Click here for directions to the coming raid!'), url=_('https://www.google.com/maps/dir/Current+Location/{0}').format(huntrgps), colour=message.guild.me.colour)
-                    raid_embed.add_field(name='**Location:**', value=_('{raid_details}').format(raid_details='\n'.join(textwrap.wrap(ghgym, width=30))), inline=True)
-                    raid_embed.add_field(name='**Starting in:**', value=_('{minutes} mins ({ghtimestamp})').format(minutes=ghminute, ghtimestamp=ghtimestamp), inline=True)
-                    raid_embed.set_thumbnail(url=_('https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/eggs/{}.png?cache=0'.format(str(ghegglevel))))
-                    raid_embed.set_footer(text=_('Reported by @{author} - {timestamp}').format(author=message.author.display_name, timestamp=timestamp), icon_url=_('https://cdn.discordapp.com/avatars/{user.id}/{user.avatar}.{format}?size={size}'.format(user=message.author, format='jpg', size=32)))
-                    raidreport = await message.channel.send(content=_('Meowth! Level {level} raid egg reported by {member}! Details: {location_details}. React if you want to make a channel for this raid!').format(level=ghegglevel, member=message.author.mention, location_details=ghgym), embed=raid_embed)
-                    timeout = (int(ghminute) * 60)
-                    await asyncio.sleep(0.25)
-                    await raidreport.add_reaction('✅')
-                    pokehuntr_dict[raidreport.id] = {
-                        "exp":time.time() + timeout,
-                        'expedit': {"content":raidreport.content.split(" React")[0],"embedcontent":expiremsg},
-                        "reporttype":"egg",
-                        "reportchannel":message.channel.id,
-                        "level":ghegglevel,
-                        "pokemon":None,
-                        "reporttime":now,
-                        "huntr":huntr,
-                        "embed":raid_embed
-                    }
-                    guild_dict[message.guild.id]['pokehuntr_dict'] = pokehuntr_dict
-                    return
-        if message.author.id == 295116861920772098 and message.embeds and guild_dict[message.guild.id]['configure_dict']['scanners']['autowild']:
-            hpokeid = message.embeds[0].title.split(' ')[2]
-            hdesc = message.embeds[0].description.splitlines()
-            hexpire = None
-            hweather = None
-            hiv = None
-            huntrgps = "https://pokehuntr.com/#{huntrgps}".format(huntrgps=huntrgps)
-            for line in hdesc:
-                if "remaining:" in line.lower():
-                    hexpire = line.split(': ')[1][:(- 1)]
-                if "weather:" in line.lower():
-                    hweather = line.split(': ')[1][1:(- 1)]
-                if "iv:" in line.lower():
-                    hiv = line.split(': ')[1][2:(-2)]
-            hextra = "Weather: {hweather}".format(hweather=hweather)
-            if hiv:
-                hextra += " / IV: {hiv}".format(hiv=hiv)
-            huntr = '!wild {0} {1}|{2}|{3}'.format(hpokeid, huntrgps, hexpire, hextra)
-            await message.delete()
-            await _wild(message, content="",huntr=huntr)
-            return
-    else:
-        huntr = pokehuntr_dict[message.id]['huntr']
-        reporttime = pokehuntr_dict[message.id]['reporttime']
-        reporttype = pokehuntr_dict[message.id]['reporttype']
-        huntrtime = huntr.split("|")[0][-1]
-        reacttime = datetime.datetime.utcnow() + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'])
-        timediff = relativedelta(reacttime, reporttime)
-        time = int(huntrtime) - int(timediff.minutes)
-        huntr = huntr.replace(huntrtime,time)
-        if reporttype == "egg":
-            raid_channel = await _raidegg(message, content="",huntr=huntr)
-        elif reporttype == "raid":
-            raid_channel = await _raid(message, content="",huntr=huntr)
-        await message.delete()
-    return
-
-async def on_pokealarm(message, reactuser=None):
-    """Requires a specific message.content format, which is "content" in PokeAlarm
-    Raid format = !raid <mon_name> <gym_name> <raid_time_left>|<lat>,<lng>|<quick_move> / <charge_move>
-    Raidegg format = !raidegg <egg_lvl> <gym_name> <hatch_time_left>|<lat>,<lng>
-    Wild format = !wild <mon_name> <lat>,<lng>|<time_left>|Weather: <weather> / IV: <iv>
-    I also recommend to set the username to just PokeAlarm"""
-    pokealarm_dict = copy.deepcopy(guild_dict[guild.id].get('pokealarm_dict',{}))
-    if not reactuser:
-        reporttype = None
-        report = None
-        embed = message.embeds[0] if message.embeds else None
-        await message.delete()
-        now = datetime.datetime.utcnow() + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'])
-        painfo = message.content.split("|")
-        if "!raidegg" in message.content.lower():
-            reporttype = "egg"
-            gps = painfo.pop(1)
-            painfo = " ".join(painfo).split()[1:-1]
-            level = painfo.pop(0)
-            pokeid = None
-            time = painfo.pop(-1)[:-1]
-            gym = " ".join(painfo)
-            timeout = int(time)*60
-            expiremsg = _('**This level {level} raid egg has hatched!**').format(level=pokealarm_dict[alertid]['level'])
-            huntr = "!raidegg {level} {gym} {time}|{gps}".format(level=level,gym=gym,time=time,gps=gps)
-        elif "!raid" in message.content.lower():
-            reporttype = "raid"
-            gps = painfo.pop(1)
-            moves = painfo.pop(1)
-            painfo = " ".join(painfo).split()[1:-1]
-            pokeid = painfo.pop(0)
-            level = 0
-            time = painfo.pop(-1)[:-1]
-            gym = " ".join(painfo)
-            timeout = int(time)*60
-            expiremsg = _('**This {pokemon} raid has expired!**').format(pokemon=pokeid.title())
-            huntr = "!raid {pokeid} {gym} {time}|{gps}|{moves}".format(pokeid=pokeid,gym=gym,time=time,gps=gps,moves=moves)
-        elif "!wild" in message.content.lower():
-            reporttype = "wild"
-            time = painfo.pop(1).split()
-            minutes = time.pop(0)[:-1]
-            seconds = time.pop(0)[:-1]
-            time = "{min} min {sec} sec".format(min=minutes,sec=seconds)
-            weather = painfo.pop(1)
-            painfo = " ".join(painfo).split()[1:]
-            pokeid = painfo.pop(0)
-            location = " ".join(painfo)
-            location = "https://www.google.com/maps/dir/Current+Location/{location}".format(location=location)
-            despawn = (int(minutes) * 60) + int(seconds)
-            huntr = '!wild {pokeid} {gps}|{time}|{weather}'.format(pokeid=pokeid,gps=location,time=time,weather=weather)
-        if reporttype == "wild":
-            await _wild(message, content="",huntr=huntr)
-            return
-        else:
-            for channelid in guild_dict[message.guild.id]['raidchannel_dict']:
-                if guild_dict[message.guild.id]['raidchannel_dict'][channelid].get('gymhuntrgps',None) == gps:
-                    channel = Meowth.get_channel(channelid)
-                    if guild_dict[message.guild.id]['raidchannel_dict'][channelid].get('type',None) == 'egg':
-                        await _eggtoraid(pokeid.lower().strip(), channel, message.author, message.content)
-                    if embed and channel:
-                        await channel.send(embed=embed)
-                    return
-            if guild_dict[message.guild.id]['configure_dict']['scanners'].get('alarmaction',None) == 'auto':
-                if reporttype == "egg":
-                    huntr = "!raidegg {level} {gym} {time}|{gps}".format(level=level,gym=gym,time=time,gps=gps)
-                    raid_channel = await _raidegg(message, content="",huntr=huntr)
-                elif reporttype == "raid":
-                    huntr = "!raid {pokeid} {gym} {time}|{gps}|{moves}".format(pokeid=pokeid,gym=gym,time=time,gps=gps,moves=moves)
-                    raid_channel = await _raid(message, content="",huntr=huntr)
-                if embed and raid_channel:
-                    await raid_channel.send(embed=embed)
-            elif guild_dict[message.guild.id]['configure_dict']['scanners'].get('alarmaction',None) == 'react':
-                if reporttype == "egg":
-                    pamsg = await message.channel.send(("If you want me to report this level {level} egg, just react!").format(level=level),embed=embed)
-                elif reporttype == "raid":
-                    pamsg = await message.channel.send(("If you want me to report this {pokeid} raid, just react!").format(pokeid=pokeid),embed=embed)
-                await asyncio.sleep(0.25)
-                await pamsg.add_reaction('✅')
-                pokealarm_dict[pamsg.id] = {
-                    "exp":time.time() + timeout,
-                    'expedit': {"content":None,"embedcontent":expiremsg},
-                    "reporttype":reporttype,
-                    "reportchannel":message.channel.id,
-                    "level":level,
-                    "pokemon":pokeid,
-                    "reporttime":now,
-                    "huntr":huntr,
-                    "embed":embed
-                }
-                guild_dict[message.guild.id]['pokealarm_dict'] = pokealarm_dict
-    else:
-        huntr = pokealarm_dict[message.id]['huntr']
-        embed = pokealarm_dict[message.id]['embed']
-        reporttime = pokealarm_dict[message.id]['reporttime']
-        reporttype = pokealarm_dict[message.id]['reporttype']
-        huntrtime = huntr.split("|")[0][-1]
-        reacttime = datetime.datetime.utcnow() + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'])
-        timediff = relativedelta(reacttime, reporttime)
-        time = int(huntrtime) - int(timediff.minutes)
-        huntr = huntr.replace(huntrtime,time)
-        if reporttype == "egg":
-            raid_channel = await _raidegg(message, content="",huntr=huntr)
-        elif reporttype == "raid":
-            raid_channel = await _raid(message, content="",huntr=huntr)
-        if embed and raid_channel:
-            await raid_channel.send(embed=embed)
-        await message.delete()
+@Meowth.event
+async def on_message_delete(message):
+    guild = message.guild
+    channel = message.channel
+    author = message.author
+    if channel.id in guild_dict[guild.id]['raidchannel_dict'] and guild_dict[guild.id]['configure_dict']['archive']['enabled']:
+        if message.content.strip() == "!archive":
+            guild_dict[guild.id]['raidchannel_dict'][channel.id]['archive'] = True
+        if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('archive', False):
+            logs = guild_dict[guild.id]['raidchannel_dict'][channel.id].get('logs', {})
+            logs[message.id] = {'author_id': message.author.id, 'author_str': str(message.author),'author_avy':message.author.avatar_url,'author_nick':message.author.nick,'color_int':message.author.color.value,'content': message.clean_content,'created_at':message.created_at}
+            guild_dict[guild.id]['raidchannel_dict'][channel.id]['logs'] = logs
 
 @Meowth.event
 async def on_raw_reaction_add(payload):
     channel = Meowth.get_channel(payload.channel_id)
     try:
         message = await channel.get_message(payload.message_id)
-    except (discord.errors.NotFound, AttributeError):
+    except (discord.errors.NotFound, AttributeError, discord.Forbidden):
         return
     guild = message.guild
     try:
@@ -1493,19 +1294,31 @@ async def on_raw_reaction_add(payload):
         await on_pokealarm(message, user)
     if message.id in pokehuntr_dict.keys() and not user.bot and str(payload.emoji) == "✅":
         await on_huntr(message, user)
-    if channel.id in guild_dict[guild.id]['raidchannel_dict'] and message.id == guild_dict[guild.id]['raidchannel_dict'][channel.id].get('ctrsmessage',None) and user.id != Meowth.user.id:
-        ctrs_dict = guild_dict[guild.id]['raidchannel_dict'][channel.id]['ctrs_dict']
-        for i in ctrs_dict:
-            if ctrs_dict[i]['emoji'] == str(payload.emoji):
-                newembed = ctrs_dict[i]['embed']
-                moveset = i
-                break
-        else:
-            return
-        await message.edit(embed=newembed)
-        await message.remove_reaction(payload.emoji, user)
-        guild_dict[guild.id]['raidchannel_dict'][channel.id]['moveset'] = moveset
-    if message.id in guild_dict[guild.id]['wildreport_dict'] and user.id != Meowth.user.id:
+    if channel.id in guild_dict[guild.id]['raidchannel_dict'] and user.id != Meowth.user.id:
+        if message.id == guild_dict[guild.id]['raidchannel_dict'][channel.id].get('ctrsmessage',None):
+            ctrs_dict = guild_dict[guild.id]['raidchannel_dict'][channel.id]['ctrs_dict']
+            for i in ctrs_dict:
+                if ctrs_dict[i]['emoji'] == str(payload.emoji):
+                    newembed = ctrs_dict[i]['embed']
+                    moveset = i
+                    break
+            else:
+                return
+            await message.edit(embed=newembed)
+            guild_dict[guild.id]['raidchannel_dict'][channel.id]['moveset'] = moveset
+            await message.remove_reaction(payload.emoji, user)
+        elif message.id == guild_dict[guild.id]['raidchannel_dict'][channel.id].get('raidmessage',None):
+            if str(payload.emoji) == '\u2754':
+                prefix = guild_dict[guild.id]['configure_dict']['settings']['prefix']
+                prefix = prefix or Meowth.config['default_prefix']
+                avatar = Meowth.user.avatar_url
+                await utils.get_raid_help(prefix, avatar, user)
+            await message.remove_reaction(payload.emoji, user)
+    try:
+        wildreport_dict = guild_dict[guild.id]['wildreport_dict']
+    except KeyError:
+        wildreport_dict = []
+    if message.id in wildreport_dict and user.id != Meowth.user.id:
         wild_dict = guild_dict[guild.id]['wildreport_dict'][message.id]
         if str(payload.emoji) == '🏎':
             wild_dict['omw'].append(user.mention)
@@ -1514,22 +1327,10 @@ async def on_raw_reaction_add(payload):
             for reaction in message.reactions:
                 if reaction.emoji == '💨' and reaction.count >= 2:
                     if wild_dict['omw']:
-                        await channel.send(f"{', '.join(wild_dict['omw'])}: the {wild_dict['pokemon'].title()} has despawned!")
+                        despawn = _("has despawned")
+                        await channel.send(f"{', '.join(wild_dict['omw'])}: {wild_dict['pokemon'].title()} {despawn}!")
                     await expire_wild(message)
 
-@Meowth.event
-async def on_message_delete(message):
-    guild = message.guild
-    channel = message.channel
-    author = message.author
-    if channel.id in guild_dict[guild.id]['raidchannel_dict'] and guild_dict[guild.id]['configure_dict']['archive']['enabled']:
-        if message.content.strip() == "!archive":
-            guild_dict[guild.id]['raidchannel_dict'][channel.id]['archive'] = True
-        if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('archive', False):
-            logs = guild_dict[guild.id]['raidchannel_dict'][channel.id].get('logs', {})
-            logs[message.id] = {'author_id': message.author.id, 'author_str': str(message.author),'author_avy':message.author.avatar_url,'author_nick':message.author.nick,'color_int':message.author.color.value,'content': message.clean_content,'created_at':message.created_at}
-            guild_dict[guild.id]['raidchannel_dict'][channel.id]['logs'] = logs
-
 """
 Admin Commands
 """
@@ -1661,7 +1462,7 @@ async def regional(ctx, regional):
         regional = int(regional)
     else:
         regional = regional.lower()
-        if regional == "reset" and checks.is_owner_check(ctx):
+        if regional == "reset" and checks.is_dev_or_owner(ctx):
             msg = _("Are you sure you want to clear all regionals?")
             question = await ctx.channel.send(msg)
             try:
@@ -1690,6 +1491,7 @@ async def regional(ctx, regional):
     if regional in get_raidlist():
         _set_regional(Meowth, ctx.guild, regional)
         await ctx.message.channel.send(_("Meowth! Regional raid boss set to **{boss}**!").format(boss=get_name(regional).title()))
+
     else:
         await ctx.message.channel.send(_("Meowth! That Pokemon doesn't appear in raids!"))
         return
@@ -1734,57 +1536,52 @@ def _set_prefix(bot, guild, prefix):
     bot.guild_dict[guild.id]['configure_dict']['settings']['prefix'] = prefix
 
 @_set.command()
-async def silph(ctx, silphid: str = ''):
+async def silph(ctx, silph_user: str = None):
     """Links a server member to a Silph Road Travelers Card."""
-    if not silphid:
+    if not silph_user:
         await ctx.send(_('Silph Road Travelers Card cleared!'))
         try:
             del guild_dict[ctx.guild.id]['trainers'][ctx.author.id]['silphid']
         except:
             pass
         return
-    url = f'https://sil.ph/{silphid}.json'
+
+    silph_cog = ctx.bot.cogs.get('Silph')
+    if not silph_cog:
+        return await ctx.send(
+            _("The Silph Extension isn't accessible at the moment, sorry!"))
+
     async with ctx.typing():
-        async with aiohttp.ClientSession() as sess:
-            async with sess.get(url) as resp:
-                data = await resp.json()
-        if data.get('error', None):
-            if data['error']=="Private Travelers Card":
-                await ctx.send(_('This Travelers Card is private and cannot be linked!'))
-                return
-            elif data['error']=='Card not found':
-                await ctx.send(_('Travelers Card not found!'))
-                return
-        else:
-            socials = data['data'].get('socials', None)
-            if not socials:
-                await ctx.send(_('No Discord account found linked to this Travelers Card!'))
-                return
-            else:
-                disuser = ''
-                for social in socials:
-                    if social['vendor'] == "Discord":
-                        disuser = social['username']
-                        break
-                    else:
-                        continue
-                if not disuser:
-                    await ctx.send(_('No Discord account found linked to this Travelers Card!'))
-                    return
-                elif disuser != str(ctx.author):
-                    await ctx.send(_('This Travelers Card is linked to another Discord account!'))
-                    return
-                else:
-                    embed = _get_silph(ctx,data)
-                    trainers = guild_dict[ctx.guild.id].get('trainers', {})
-                    author = trainers.get(ctx.author.id,{})
-                    author['silphid'] = silphid
-                    trainers[ctx.author.id] = author
-                    guild_dict[ctx.guild.id]['trainers'] = trainers
-                    await ctx.send(_('This Travelers Card has been successfully linked to you!'),embed=embed)
+        card = await silph_cog.get_silph_card(silph_user)
+        if not card:
+            return await ctx.send(_('Silph Card for {silph_user} not found.').format(silph_user=silph_user))
+
+    if not card.discord_name:
+        return await ctx.send(
+            _('No Discord account found linked to this Travelers Card!'))
+
+    if card.discord_name != str(ctx.author):
+        return await ctx.send(
+            _('This Travelers Card is linked to another Discord account!'))
+
+    try:
+        offset = ctx.bot.guild_dict[ctx.guild.id]['configure_dict']['settings']['offset']
+    except KeyError:
+        offset = None
+
+    trainers = guild_dict[ctx.guild.id].get('trainers', {})
+    author = trainers.get(ctx.author.id,{})
+    author['silphid'] = silph_user
+    trainers[ctx.author.id] = author
+    guild_dict[ctx.guild.id]['trainers'] = trainers
+
+    await ctx.send(
+        _('This Travelers Card has been successfully linked to you!'),
+        embed=card.embed(offset))
 
 @_set.command()
 async def pokebattler(ctx, pbid: int = 0):
+    """Links a server member to a PokeBattler ID."""
     if not pbid:
         await ctx.send(_('Pokebattler ID cleared!'))
         try:
@@ -1797,7 +1594,7 @@ async def pokebattler(ctx, pbid: int = 0):
     author['pokebattlerid'] = pbid
     trainers[ctx.author.id] = author
     guild_dict[ctx.guild.id]['trainers'] = trainers
-    await ctx.send(_(f'Pokebattler ID set to {pbid}!'))
+    await ctx.send(_('Pokebattler ID set to {pbid}!').format(pbid=pbid))
 
 @_set.command()
 async def trainercode(ctx, *, trainercode: str = None):
@@ -1842,7 +1639,7 @@ async def perms(ctx, channel_id = None):
     req_perms = discord.Permissions(268822608)
 
     embed = discord.Embed(colour=ctx.guild.me.colour)
-    embed.set_author(name='Bot Permissions', icon_url="https://i.imgur.com/wzryVaS.png")
+    embed.set_author(name=_('Bot Permissions'), icon_url="https://i.imgur.com/wzryVaS.png")
 
     wrap = functools.partial(textwrap.wrap, width=20)
     names = [wrap(channel.name), wrap(guild.name)]
@@ -1857,7 +1654,7 @@ def same_len(txt):
     def perms_result(perms):
         data = []
         meet_req = perms >= req_perms
-        result = "**PASS**" if meet_req else "**FAIL**"
+        result = _("**PASS**") if meet_req else _("**FAIL**")
         data.append(f"{result} - {perms.value} \n")
         true_perms = [k for k, v in dict(perms).items() if v is True]
         false_perms = [k for k, v in dict(perms).items() if v is False]
@@ -1865,26 +1662,28 @@ def perms_result(perms):
         true_perms_str = '\n'.join(true_perms)
         if not meet_req:
             missing = '\n'.join([p for p in false_perms if p in req_perms_list])
-            data.append(f"**MISSING** \n{missing} \n")
+            meet_req_result = _("**MISSING**")
+            data.append(f"{meet_req_result} \n{missing} \n")
         if true_perms_str:
-            data.append(f"**ENABLED** \n{true_perms_str} \n")
+            meet_req_result = _("**ENABLED**")
+            data.append(f"{meet_req_result} \n{true_perms_str} \n")
         return '\n'.join(data)
     guild_msg.append(perms_result(guild_perms))
     chan_msg.append(perms_result(chan_perms))
-    embed.add_field(name='GUILD', value='\n'.join(guild_msg))
+    embed.add_field(name=_('GUILD'), value='\n'.join(guild_msg))
     if channel.category:
         cat_perms = channel.category.permissions_for(guild.me)
         cat_msg = [f"**{names[2]}** \n{channel.category.id} \n"]
         cat_msg.append(perms_result(cat_perms))
-        embed.add_field(name='CATEGORY', value='\n'.join(cat_msg))
-    embed.add_field(name='CHANNEL', value='\n'.join(chan_msg))
+        embed.add_field(name=_('CATEGORY'), value='\n'.join(cat_msg))
+    embed.add_field(name=_('CHANNEL'), value='\n'.join(chan_msg))
 
     try:
         await ctx.send(embed=embed)
     except discord.errors.Forbidden:
         # didn't have permissions to send a message with an embed
         try:
-            msg = "I couldn't send an embed here, so I've sent you a DM"
+            msg = _("I couldn't send an embed here, so I've sent you a DM")
             await ctx.send(msg)
         except discord.errors.Forbidden:
             # didn't have permissions to send a message at all
@@ -1998,7 +1797,7 @@ def check(reaction, user):
             recipients = {
 
             }
-            embeddraft.set_footer(text=_('For support, contact us on our Discord server.'))
+            embeddraft.set_footer(text=_('For support, contact us on our Discord server. Invite Code: hhVjAN8'))
             embeddraft.colour = discord.Colour.lighter_grey()
             for guild in Meowth.guilds:
                 recipients[guild.name] = guild.owner
@@ -2032,7 +1831,7 @@ async def configure(ctx, *, configlist: str=""):
     Meowth will DM you instructions on how to configure Meowth for your server.
     If it is not your first time configuring, you can choose a section to jump to.
     You can also include a comma separated [list] of sections from the following:
-    all, team, welcome, raid, exraid, invite, counters, wild, research, want, archive, timezone, scanners"""
+    all, team, welcome, raid, exraid, invite, counters, wild, research, want, archive, timezone"""
     await _configure(ctx, configlist)
 
 async def _configure(ctx, configlist):
@@ -2046,7 +1845,10 @@ async def _configure(ctx, configlist):
     guild_dict[ctx.guild.id]['configure_dict']['settings']['config_sessions'][owner.id] = config_sessions
     for session in guild_dict[guild.id]['configure_dict']['settings']['config_sessions'].keys():
         if not guild.get_member(session):
-            del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][session]
+            try:
+                del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][session]
+            except KeyError:
+                pass
     config_dict_temp = getattr(ctx, 'config_dict_temp',copy.deepcopy(guild_dict[guild.id]['configure_dict']))
     firstconfig = False
     all_commands = [str(x) for x in config_dict_temp.keys()]
@@ -2074,7 +1876,7 @@ async def _configure(ctx, configlist):
             if config_dict_temp[commandconfig].get('enabled',False):
                 enabled_commands.append(commandconfig)
         configmessage += _("\n\n**Enabled Commands:**\n{enabled_commands}").format(enabled_commands=", ".join(enabled_commands))
-        configmessage += _("\n\n**All Commands:**\n**all** - To redo configuration\n**team** - For Team Assignment configuration\n**welcome** - For Welcome Message configuration\n**raid** - for raid command configuration\n**exraid** - for EX raid command configuration\n**invite** - for invite command configuration\n**counters** - for automatic counters configuration\n**wild** - for wild command configuration\n**research** - for !research command configuration\n**meetup** - for !meetup command configuration\n**want** - for want/unwant command configuration\n**archive** - For !archive configuration\n**timezone** - For timezone configuration\n**scanners** - For scanner bot integration configuration")
+        configmessage += _("\n\n**All Commands:**\n**all** - To redo configuration\n**team** - For Team Assignment configuration\n**welcome** - For Welcome Message configuration\n**raid** - for raid command configuration\n**exraid** - for EX raid command configuration\n**invite** - for invite command configuration\n**counters** - for automatic counters configuration\n**wild** - for wild command configuration\n**research** - for !research command configuration\n**meetup** - for !meetup command configuration\n**want** - for want/unwant command configuration\n**archive** - For !archive configuration\n**trade** - For trade command configuration\n**timezone** - For timezone configuration\n**scanners** - For scanner bot integration configuration")
         configmessage += _('\n\nReply with **cancel** at any time throughout the questions to cancel the configure process.')
         await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=configmessage).set_author(name=_('Meowth Configuration - {guild}').format(guild=guild.name), icon_url=Meowth.user.avatar_url))
         while True:
@@ -2084,7 +1886,10 @@ def check(m):
             configreply.content = configreply.content.replace("timezone", "settings")
             if configreply.content.lower() == 'cancel':
                 await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('**CONFIG CANCELLED!**\n\nNo changes have been made.')))
-                del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+                try:
+                    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+                except KeyError:
+                    pass
                 return None
             elif "all" in configreply.content.lower():
                 configreplylist = all_commands
@@ -2122,6 +1927,10 @@ def check(m):
             ctx = await _configure_exraid(ctx)
             if not ctx:
                 return None
+        if "meetup" in configreplylist:
+            ctx = await _configure_meetup(ctx)
+            if not ctx:
+                return None
         if "invite" in configreplylist:
             ctx = await _configure_invite(ctx)
             if not ctx:
@@ -2138,10 +1947,6 @@ def check(m):
             ctx = await _configure_research(ctx)
             if not ctx:
                 return None
-        if "meetup" in configreplylist:
-            ctx = await _configure_meetup(ctx)
-            if not ctx:
-                return None
         if "want" in configreplylist:
             ctx = await _configure_want(ctx)
             if not ctx:
@@ -2150,6 +1955,10 @@ def check(m):
             ctx = await _configure_archive(ctx)
             if not ctx:
                 return None
+        if "trade" in configreplylist:
+            ctx = await _configure_trade(ctx)
+            if not ctx:
+                return None
         if "settings" in configreplylist:
             ctx = await _configure_settings(ctx)
             if not ctx:
@@ -2162,11 +1971,14 @@ def check(m):
         if ctx:
             ctx.config_dict_temp['settings']['done'] = True
             guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-            await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+            await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+        try:
+            del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        except KeyError:
+            pass
 
-@configure.command()
-async def all(ctx):
+@configure.command(name='all')
+async def configure_all(ctx):
     """All settings"""
     await _configure(ctx, "all")
 
@@ -2189,14 +2001,17 @@ async def team(ctx):
     ctx = await _configure_team(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_team(ctx):
     guild = ctx.message.guild
     owner = ctx.message.author
     config_dict_temp = getattr(ctx, 'config_dict_temp',copy.deepcopy(guild_dict[guild.id]['configure_dict']))
-    await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Team assignment allows users to assign their Pokemon Go team role using the **!team** command. If you have a bot that handles this already, you may want to disable this feature.\n\nIf you are to use this feature, you can configure the roles you would like to use for team assignment after enabling.\n\nRespond here with: **N** to disable, **Y** to enable:")).set_author(name=_('Team Assignments'), icon_url=Meowth.user.avatar_url))
+    await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Team assignment allows users to assign their Pokemon Go team role using the **!team** command. If you have a bot that handles this already, you may want to disable this feature.\n\nIf you are to use this feature, ensure existing team roles are as follows: mystic, valor, instinct. These must be all lowercase letters. If they don't exist yet, I'll make some for you instead.\n\nRespond here with: **N** to disable, **Y** to enable:")).set_author(name=_('Team Assignments'), icon_url=Meowth.user.avatar_url))
     while True:
         teamreply = await Meowth.wait_for('message', check=(lambda message: (message.guild == None) and message.author == owner))
         if teamreply.content.lower() == 'y':
@@ -2263,7 +2078,7 @@ def check(m):
             await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('**CONFIG CANCELLED!**\n\nNo changes have been made.')))
             return None
         else:
-            await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description="I'm sorry I don't understand. Please reply with either **N** to disable, or **Y** to enable."))
+            await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_("I'm sorry I don't understand. Please reply with either **N** to disable, or **Y** to enable.")))
             continue
     ctx.config_dict_temp = config_dict_temp
     return ctx
@@ -2287,8 +2102,11 @@ async def welcome(ctx):
     ctx = await _configure_welcome(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_welcome(ctx):
     guild = ctx.message.guild
@@ -2360,7 +2178,7 @@ async def _configure_welcome(ctx):
                             except TypeError:
                                 timeout = True
                     if timeout or res.emoji == '❎':
-                        await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description="Please enter a new welcome message, or reply with **N** to use the default."))
+                        await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_("Please enter a new welcome message, or reply with **N** to use the default.")))
                         continue
                     else:
                         config_dict_temp['welcome']['welcomemsg'] = welcomemessage
@@ -2446,8 +2264,11 @@ async def raid(ctx):
     ctx = await _configure_raid(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_raid(ctx):
     guild = ctx.message.guild
@@ -2637,7 +2458,7 @@ async def _configure_raid(ctx):
                             await owner.send(embed=discord.Embed(colour=discord.Colour.orange(),description=msg))
                             continue
                     else:
-                        msg = _("The number of categories I found in your server doesn't match the number of raid levels! Make sure you give me exactly six categories, one for each level of raid. You can use the same category for multiple levels if you want, but I need to see six category names.\n\n**Matched Categories:** {catlist}\n\nPlease double check your categories.").format(catlist=', '.join(levelcat_names) if len(levelcat_list)>0 else "None")
+                        msg = _("The number of categories I found in your server doesn't match the number of raid levels! Make sure you give me exactly six categories, one for each level of raid. You can use the same category for multiple levels if you want, but I need to see five category names.\n\n**Matched Categories:** {catlist}\n\nPlease double check your categories.").format(catlist=', '.join(levelcat_names) if len(levelcat_list)>0 else "None")
                         if levelcat_errors:
                             msg += _("\n\nThe following aren't in your server: **{invalid_categories}**").format(invalid_categories=', '.join(levelcat_errors))
                         await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=msg))
@@ -2670,8 +2491,11 @@ async def exraid(ctx):
     ctx = await _configure_exraid(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_exraid(ctx):
     guild = ctx.message.guild
@@ -2827,17 +2651,17 @@ async def _configure_exraid(ctx):
             permsconfigset = await Meowth.wait_for('message', check=(lambda message: (message.guild == None) and message.author == owner))
             if permsconfigset.content.lower() == 'everyone':
                 config_dict_temp['exraid']['permissions'] = "everyone"
-                await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description='Everyone permission enabled'))
+                await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description=_('Everyone permission enabled')))
                 break
             elif permsconfigset.content.lower() == 'same':
                 config_dict_temp['exraid']['permissions'] = "same"
-                await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description='Same permission enabled'))
+                await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description=_('Same permission enabled')))
                 break
             elif permsconfigset.content.lower() == 'cancel':
-                await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description='**CONFIG CANCELLED!**\n\nNo changes have been made.'))
+                await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('**CONFIG CANCELLED!**\n\nNo changes have been made.')))
                 return None
             else:
-                await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description="I'm sorry I don't understand. Please reply with either **N** to disable, or **Y** to enable."))
+                await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_("I'm sorry I don't understand. Please reply with either **N** to disable, or **Y** to enable.")))
                 continue
     ctx.config_dict_temp = config_dict_temp
     return ctx
@@ -2861,29 +2685,32 @@ async def invite(ctx):
     ctx = await _configure_invite(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_invite(ctx):
     guild = ctx.message.guild
     owner = ctx.message.author
     config_dict_temp = getattr(ctx, 'config_dict_temp',copy.deepcopy(guild_dict[guild.id]['configure_dict']))
-    await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description='Do you want access to EX raids controlled through members using the **!invite** command?\nIf enabled, members will have read-only permissions for all EX Raids until they use **!invite** to gain access. If disabled, EX Raids will inherit the permissions from their reporting channels.\n\nRespond with: **N** to disable, or **Y** to enable:').set_author(name='Invite Configuration', icon_url=Meowth.user.avatar_url))
+    await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_('Do you want access to EX raids controlled through members using the **!invite** command?\nIf enabled, members will have read-only permissions for all EX Raids until they use **!invite** to gain access. If disabled, EX Raids will inherit the permissions from their reporting channels.\n\nRespond with: **N** to disable, or **Y** to enable:')).set_author(name=_('Invite Configuration'), icon_url=Meowth.user.avatar_url))
     while True:
         inviteconfigset = await Meowth.wait_for('message', check=(lambda message: (message.guild == None) and message.author == owner))
         if inviteconfigset.content.lower() == 'y':
             config_dict_temp['invite']['enabled'] = True
-            await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description='Invite Command enabled'))
+            await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description=_('Invite Command enabled')))
             break
         elif inviteconfigset.content.lower() == 'n':
             config_dict_temp['invite']['enabled'] = False
-            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description='Invite Command disabled'))
+            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('Invite Command disabled')))
             break
         elif inviteconfigset.content.lower() == 'cancel':
-            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description='**CONFIG CANCELLED!**\n\nNo changes have been made.'))
+            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('**CONFIG CANCELLED!**\n\nNo changes have been made.')))
             return None
         else:
-            await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description="I'm sorry I don't understand. Please reply with either **N** to disable, or **Y** to enable."))
+            await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_("I'm sorry I don't understand. Please reply with either **N** to disable, or **Y** to enable.")))
             continue
     ctx.config_dict_temp = config_dict_temp
     return ctx
@@ -2905,23 +2732,26 @@ async def counters(ctx):
     ctx = await _configure_counters(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_counters(ctx):
     guild = ctx.message.guild
     owner = ctx.message.author
     config_dict_temp = getattr(ctx, 'config_dict_temp',copy.deepcopy(guild_dict[guild.id]['configure_dict']))
-    await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description='Do you want to generate an automatic counters list in newly created raid channels using PokeBattler?\nIf enabled, I will post a message containing the best counters for the raid boss in new raid channels. Users will still be able to use **!counters** to generate this list.\n\nRespond with: **N** to disable, or enable with a comma separated list of boss levels that you would like me to generate counters for. Example:`3,4,5,EX`').set_author(name='Automatic Counters Configuration', icon_url=Meowth.user.avatar_url))
+    await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_('Do you want to generate an automatic counters list in newly created raid channels using PokeBattler?\nIf enabled, I will post a message containing the best counters for the raid boss in new raid channels. Users will still be able to use **!counters** to generate this list.\n\nRespond with: **N** to disable, or enable with a comma separated list of boss levels that you would like me to generate counters for. Example:`3,4,5,EX`')).set_author(name=_('Automatic Counters Configuration'), icon_url=Meowth.user.avatar_url))
     while True:
         countersconfigset = await Meowth.wait_for('message', check=(lambda message: (message.guild == None) and message.author == owner))
         if countersconfigset.content.lower() == 'n':
             config_dict_temp['counters']['enabled'] = False
             config_dict_temp['counters']['auto_levels'] = []
-            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description='Automatic Counters disabled'))
+            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('Automatic Counters disabled')))
             break
         elif countersconfigset.content.lower() == 'cancel':
-            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description='**CONFIG CANCELLED!**\n\nNo changes have been made.'))
+            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('**CONFIG CANCELLED!**\n\nNo changes have been made.')))
             return None
         else:
             raidlevel_list = countersconfigset.content.lower().split(',')
@@ -2938,7 +2768,7 @@ async def _configure_counters(ctx):
                 await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description=_('Automatic Counter Levels set to: {levels}').format(levels=', '.join((str(x) for x in config_dict_temp['counters']['auto_levels'])))))
                 break
             else:
-                await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description="Please enter at least one level from 1 to EX separated by comma. Ex: `4,5,EX` or **N** to turn off automatic counters."))
+                await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_("Please enter at least one level from 1 to EX separated by comma. Ex: `4,5,EX` or **N** to turn off automatic counters.")))
                 continue
     ctx.config_dict_temp = config_dict_temp
     return ctx
@@ -2962,8 +2792,11 @@ async def wild(ctx):
     ctx = await _configure_wild(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_wild(ctx):
     guild = ctx.message.guild
@@ -3062,8 +2895,11 @@ async def research(ctx):
     ctx = await _configure_research(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_research(ctx):
     guild = ctx.message.guild
@@ -3162,13 +2998,17 @@ async def meetup(ctx):
     ctx = await _configure_meetup(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_meetup(ctx):
     guild = ctx.message.guild
     owner = ctx.message.author
     config_dict_temp = getattr(ctx, 'config_dict_temp',copy.deepcopy(guild_dict[guild.id]['configure_dict']))
+    config_dict_temp['meetup'] = {}
     await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meetup Reporting allows users to report meetups with **!meetup** or **!event**. Meetup reports are contained within one or more channels. Each channel will be able to represent different areas/communities. I'll need you to provide a list of channels in your server you will allow reports from in this format: `channel-name, channel-name, channel-name`\n\nExample: `kansas-city-meetups, hull-meetups, sydney-meetups`\n\nIf you do not require meetup reporting, you may want to disable this function.\n\nRespond with: **N** to disable, or the **channel-name** list to enable, each seperated with a comma and space:")).set_author(name=_('Meetup Reporting Channels'), icon_url=Meowth.user.avatar_url))
     citychannel_dict = {}
     while True:
@@ -3336,8 +3176,11 @@ async def want(ctx):
     ctx = await _configure_want(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_want(ctx):
     guild = ctx.message.guild
@@ -3417,8 +3260,11 @@ async def archive(ctx):
     ctx = await _configure_archive(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_archive(ctx):
     guild = ctx.message.guild
@@ -3492,8 +3338,11 @@ async def timezone(ctx):
     ctx = await _configure_settings(ctx)
     if ctx:
         guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
-        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name='Configuration Complete', icon_url=Meowth.user.avatar_url))
-    del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
 
 async def _configure_settings(ctx):
     guild = ctx.message.guild
@@ -3521,6 +3370,90 @@ async def _configure_settings(ctx):
     ctx.config_dict_temp = config_dict_temp
     return ctx
 
+@configure.command()
+async def trade(ctx):
+    """!trade reporting settings"""
+    guild = ctx.message.guild
+    owner = ctx.message.author
+    try:
+        await ctx.message.delete()
+    except (discord.errors.Forbidden, discord.errors.HTTPException):
+        pass
+    if not guild_dict[guild.id]['configure_dict']['settings']['done']:
+        await _configure(ctx, "all")
+        return
+    config_sessions = guild_dict[ctx.guild.id]['configure_dict']['settings'].setdefault('config_sessions',{}).setdefault(owner.id,0) + 1
+    guild_dict[ctx.guild.id]['configure_dict']['settings']['config_sessions'][owner.id] = config_sessions
+    if guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id] > 1:
+        await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_("**MULTIPLE SESSIONS!**\n\nIt looks like you have **{yoursessions}** active configure sessions. I recommend you send **cancel** first and then send your request again to avoid confusing me.\n\nYour Sessions: **{yoursessions}** | Total Sessions: **{allsessions}**").format(allsessions=sum(guild_dict[guild.id]['configure_dict']['settings']['config_sessions'].values()),yoursessions=guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id])))
+    ctx = await _configure_trade(ctx)
+    if ctx:
+        guild_dict[guild.id]['configure_dict'] = ctx.config_dict_temp
+        await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("Meowth! Alright! Your settings have been saved and I'm ready to go! If you need to change any of these settings, just type **!configure** in your server again.")).set_author(name=_('Configuration Complete'), icon_url=Meowth.user.avatar_url))
+    try:
+        del guild_dict[guild.id]['configure_dict']['settings']['config_sessions'][owner.id]
+    except KeyError:
+        pass
+
+async def _configure_trade(ctx):
+    guild = ctx.message.guild
+    owner = ctx.message.author
+    config_dict_temp = getattr(ctx, 'config_dict_temp',copy.deepcopy(guild_dict[guild.id]['configure_dict']))
+    await owner.send(embed=discord.Embed(colour=discord.Colour.lighter_grey(), description=_("The **!trade** command allows your users to organize and coordinate trades. This command requires at least one channel specifically for trades.\n\nIf you would like to disable this feature, reply with **N**. Otherwise, just send the names or IDs of the channels you want to allow the **!trade** command in, separated by commas.")).set_author(name=_('Trade Configuration'), icon_url=Meowth.user.avatar_url))
+    while True:
+        trademsg = await Meowth.wait_for('message', check=(lambda message: (message.guild == None) and message.author == owner))
+        if trademsg.content.lower() == 'cancel':
+            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('**CONFIG CANCELLED!**\n\nNo changes have been made.')))
+            return None
+        elif trademsg.content.lower() == 'n':
+            config_dict_temp['trade'] = {'enabled': False, 'report_channels': []}
+            await owner.send(embed=discord.Embed(colour=discord.Colour.red(), description=_('Trade disabled.')))
+            break
+        else:
+            trade_list = trademsg.content.lower().split(',')
+            trade_list = [x.strip() for x in trade_list]
+            guild_channel_list = []
+            for channel in guild.text_channels:
+                guild_channel_list.append(channel.id)
+            trade_list_objs = []
+            trade_list_names = []
+            trade_list_errors = []
+            for item in trade_list:
+                channel = None
+                if item.isdigit():
+                    channel = discord.utils.get(guild.text_channels, id=int(item))
+                if not channel:
+                    item = re.sub('[^a-zA-Z0-9 _\\-]+', '', item)
+                    item = item.replace(" ","-")
+                    name = await letter_case(guild.text_channels, item.lower())
+                    channel = discord.utils.get(guild.text_channels, name=name)
+                if channel:
+                    trade_list_objs.append(channel)
+                    trade_list_names.append(channel.name)
+                else:
+                    trade_list_errors.append(item)
+            trade_list_set = [x.id for x in trade_list_objs]
+            diff = set(trade_list_set) - set(guild_channel_list)
+            if (not diff) and (not trade_list_errors):
+                config_dict_temp['trade']['enabled'] = True
+                config_dict_temp['trade']['report_channels'] = trade_list_set
+                for channel in trade_list_objs:
+                    ow = channel.overwrites_for(Meowth.user)
+                    ow.send_messages = True
+                    ow.read_messages = True
+                    ow.manage_roles = True
+                    try:
+                        await channel.set_permissions(Meowth.user, overwrite = ow)
+                    except (discord.errors.Forbidden, discord.errors.HTTPException, discord.errors.InvalidArgument):
+                        await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_('I couldn\'t set my own permissions in this channel. Please ensure I have the correct permissions in {channel} using **{prefix}get perms**.').format(prefix=ctx.prefix, channel=channel.mention)))
+                await owner.send(embed=discord.Embed(colour=discord.Colour.green(), description=_('Pokemon Trades enabled')))
+                break
+            else:
+                await owner.send(embed=discord.Embed(colour=discord.Colour.orange(), description=_("The channel list you provided doesn't match with your servers channels.\n\nThe following aren't in your server: **{invalid_channels}**\n\nPlease double check your channel list and resend your reponse.").format(invalid_channels=', '.join(trade_list_errors))))
+                continue
+    ctx.config_dict_temp = config_dict_temp
+    return ctx
+
 @configure.command()
 async def scanners(ctx):
     """Configure scanner settings"""
@@ -3692,16 +3625,19 @@ async def raid_json(ctx, level=None, *, newlist=None):
                 msg += ' '
             msg += '\n'
         return await ctx.channel.send(msg)
-    elif level.isdigit() and (not newlist):
+    elif level in raid_info['raid_eggs'] and (not newlist):
         msg += _('**Level {level} raid list:** `{raidlist}` \n').format(level=level, raidlist=raid_info['raid_eggs'][level]['pokemon'])
         for pkmn in raid_info['raid_eggs'][level]['pokemon']:
             msg += '{name} ({number})'.format(name=get_name(pkmn).title(), number=pkmn)
             msg += ' '
         msg += '\n'
         return await ctx.channel.send(msg)
-    elif level.isdigit() and newlist:
-        newlist = newlist.strip('[]').replace(' ', '').split(',')
-        intlist = [int(x) for x in newlist]
+    elif level in raid_info['raid_eggs'] and newlist:
+        newlist = [item.strip() for item in newlist.strip('[]').split(',')]
+        try:
+            intlist = [int(x) for x in newlist]
+        except:
+            return await ctx.channel.send(_("I couldn't understand the list you supplied! Please use a comma-separated list of Pokemon species numbers."))
         msg += _('I will replace this:\n')
         msg += _('**Level {level} raid list:** `{raidlist}` \n').format(level=level, raidlist=raid_info['raid_eggs'][level]['pokemon'])
         for pkmn in raid_info['raid_eggs'][level]['pokemon']:
@@ -3720,7 +3656,7 @@ async def raid_json(ctx, level=None, *, newlist=None):
         except TypeError:
             timeout = True
         if timeout or res.emoji == '❎':
-            return
+            return await ctx.channel.send(_("Meowth! Configuration cancelled!"))
         elif res.emoji == '✅':
             with open(os.path.join('data', 'raid_info.json'), 'r') as fd:
                 data = json.load(fd)
@@ -3731,8 +3667,9 @@ async def raid_json(ctx, level=None, *, newlist=None):
             load_config()
             await question.clear_reactions()
             await question.add_reaction('☑')
+            return await ctx.channel.send(_("Meowth! Configuration successful!"))
         else:
-            return
+            return await ctx.channel.send(_("Meowth! I'm not sure what went wrong, but configuration is cancelled!"))
 
 @Meowth.command()
 @commands.has_permissions(manage_guild=True)
@@ -3740,6 +3677,7 @@ async def reset_board(ctx, *, user=None, type=None):
     guild = ctx.guild
     trainers = guild_dict[guild.id]['trainers']
     tgt_string = ""
+    tgt_trainer = None
     if user:
         converter = commands.MemberConverter()
         for argument in user.split():
@@ -3796,7 +3734,7 @@ async def reset_board(ctx, *, user=None, type=None):
         else:
             trainers[trainer][type] = 0
         if tgt_trainer:
-            await ctx.send(f"{tgt_trainer.display_name}'s report stats have been cleared!")
+            await ctx.send(_("{trainer}'s report stats have been cleared!").format(trainer=tgt_trainer.display_name))
             return
     await ctx.send("This server's report stats have been reset!")
 
@@ -3804,7 +3742,10 @@ async def reset_board(ctx, *, user=None, type=None):
 @commands.has_permissions(manage_channels=True)
 @checks.raidchannel()
 async def changeraid(ctx, newraid):
-    'Changes raid boss.\n\n    Usage: !changeraid <new pokemon or level>\n    Only usable by admins.'
+    """Changes raid boss.
+
+    Usage: !changeraid <new pokemon or level>
+    Only usable by admins."""
     message = ctx.message
     guild = message.guild
     channel = message.channel
@@ -3858,6 +3799,12 @@ async def changeraid(ctx, newraid):
             pass
         await channel.edit(name=raid_channel_name, topic=channel.topic)
     elif newraid and not newraid.isdigit():
+        # What a hack, subtract raidtime from exp time because _eggtoraid will add it back
+        egglevel = guild_dict[guild.id]['raidchannel_dict'][channel.id]['egglevel']
+        if egglevel == "0":
+            egglevel = get_level(newraid)
+        guild_dict[guild.id]['raidchannel_dict'][channel.id]['exp'] -= 60 * raid_info['raid_eggs'][egglevel]['raidtime']
+
         await _eggtoraid(newraid, channel, author=message.author, huntr=None)
 
 @Meowth.command()
@@ -3908,6 +3855,9 @@ async def setstatus(ctx, member: discord.Member, status,*, status_counts: str =
 @Meowth.command()
 @commands.has_permissions(manage_guild=True)
 async def cleanroles(ctx):
+    """Removes all 0 member pokemon roles.
+
+    Usage: !cleanroles"""
     cleancount = 0
     for role in copy.copy(ctx.guild.roles):
         if role.members == [] and role.name in pkmn_info['pokemon_list']:
@@ -3919,6 +3869,9 @@ async def cleanroles(ctx):
 @Meowth.command()
 @checks.allowarchive()
 async def archive(ctx):
+    """Marks a raid channel for archival.
+
+    Usage: !archive"""
     message = ctx.message
     channel = message.channel
     await ctx.message.delete()
@@ -4060,78 +4013,7 @@ async def team(ctx,*,team):
         except discord.Forbidden:
             await ctx.channel.send(_("Meowth! I can't add roles!"))
 
-@Meowth.command()
-async def silphcard(ctx, user: str = None):
-    if not user:
-        user = guild_dict[ctx.guild.id].get('trainers',{}).get(ctx.author.id,{}).get('silphid', None)
-    else:
-        if ctx.message.mentions:
-            user = guild_dict[ctx.guild.id].get('trainers', {}).get(ctx.message.mentions[0].id,{}).get('silphid', None)
-    if not user:
-        await ctx.send(_('Meowth! You did not provide a known Silph Road Traveler!'))
-        return
-    else:
-        url = f'https://sil.ph/{user}.json'
-        async with ctx.typing():
-            async with aiohttp.ClientSession() as sess:
-                async with sess.get(url) as resp:
-                    data = await resp.json()
-        if data.get('error', None):
-            await ctx.send(_(f"Meowth! {user} does not have a public Travelers Card!"))
-            return
-        embed = _get_silph(ctx,data)
-        await ctx.send(embed=embed)
-
-def _get_silph(ctx,data):
-    hyperlink_icon = "https://i.imgur.com/fn9E5nb.png"
-    silph_icon = "https://assets.thesilphroad.com/img/snoo_sr_icon.png"
-    card_id = data['data']['card_id']
-    home_region = data['data']['home_region']
-    pokedex_count = data['data']['pokedex_count']
-    raid_average = data['data']['raid_average']
-    team = data['data']['team']
-    playstyle = data['data']['playstyle']
-    modified = data['data']['modified']
-    modified_datetime = dateparser.parse(modified, settings={'TIMEZONE': 'UTC'})
-    local_datetime = modified_datetime + datetime.timedelta(hours=guild_dict[ctx.guild.id]['configure_dict']['settings']['offset'])
-    local_date = local_datetime.date().isoformat()
-    goal = data['data']['goal']
-    trainer_level = data['data']['trainer_level']
-    nest_migrations = data['data']['nest_migrations']
-    title = data['data']['title']
-    avatar = data['data']['avatar']
-    ign = data['data']['in_game_username']
-    joined = data['data']['joined']
-    joined_datetime = datetime.datetime.strptime(joined, "%Y-%m-%d %H:%M:%S")
-    local_joined = joined_datetime + datetime.timedelta(hours=guild_dict[ctx.guild.id]['configure_dict']['settings']['offset'])
-    joined_date = local_joined.date().isoformat()
-    badge_count = len(data['data']['badges'])
-    if isinstance(data['data']['checkins'], __builtins__.list):
-        checkins = len(data['data']['checkins'])
-    else:
-        checkins = 0
-    handshakes = data['data']['handshakes']
-    socials = data['data']['socials']
-    disuser = ''
-    for social in socials:
-        if social['vendor'] == "Discord":
-            disuser = social['username']
-            break
-        else:
-            continue
-    if not disuser:
-        disstring = ":grey_question: **Discord Not Provided**"
-    else:
-        disstring = ":ballot_box_with_check: **Connected to Discord:**"
-    embed = discord.Embed(title="Playstyle", colour=discord.Colour(0xe8c13c), description=f"{playstyle}, working on {goal.lower()}.\nActive around {home_region}.\n\n{disstring} {disuser}")
-    embed.set_thumbnail(url=avatar)
-    embed.set_author(name=f"{title} {ign} - Level {trainer_level} {team}", url=f"https://sil.ph/{ign.lower()}", icon_url=hyperlink_icon)
-    embed.set_footer(text=f"Silph Road Travelers Card - ID{card_id} - Updated {local_date}", icon_url=silph_icon)
-    embed.add_field(name="__Silph Stats__", value=f"**Joined:** {joined_date}\n**Badges:** {badge_count}\n**Check-ins:** {checkins}\n**Handshakes:** {handshakes}\n**Migrations:** {nest_migrations}", inline=True)
-    embed.add_field(name="__Game Stats__", value=f"**Name:** {ign}\n**Team:** {team}\n**Level:** {trainer_level}\n**Pokedex:** {pokedex_count}\n**Raids:** {raid_average}/week", inline=True)
-    return embed
-
-@Meowth.command()
+@Meowth.command(hidden=True)
 async def profile(ctx, user: discord.Member = None):
     """Displays a user's social and reporting profile.
 
@@ -4140,17 +4022,18 @@ async def profile(ctx, user: discord.Member = None):
         user = ctx.message.author
     silph = guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('silphid',None)
     if silph:
-        silph = f"[Traveler Card](https://sil.ph/{silph.lower()})"
-    embed = discord.Embed(title=f"{user.display_name}\'s Trainer Profile", colour=user.colour)
+        card = _("Traveler Card")
+        silph = f"[{card}](https://sil.ph/{silph.lower()})"
+    embed = discord.Embed(title=_("{user}\'s Trainer Profile").format(user=user.display_name), colour=user.colour)
     embed.set_thumbnail(url=user.avatar_url)
-    embed.add_field(name="Silph Road", value=f"{silph}", inline=True)
-    embed.add_field(name="Pokebattler", value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('pokebattlerid',None)}", inline=True)
-    embed.add_field(name="Trainer Code", value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('trainercode',None)}", inline=True)
-    embed.add_field(name="Raid Reports", value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('raid_reports',0)}", inline=True)
-    embed.add_field(name="Egg Reports", value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('egg_reports',0)}", inline=True)
-    embed.add_field(name="EX Raid Reports", value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('ex_reports',0)}", inline=True)
-    embed.add_field(name="Wild Reports", value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('wild_reports',0)}", inline=True)
-    embed.add_field(name="Research Reports", value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('research_reports',0)}", inline=True)
+    embed.add_field(name=_("Silph Road"), value=f"{silph}", inline=True)
+    embed.add_field(name=_("Pokebattler"), value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('pokebattlerid',None)}", inline=True)
+    embed.add_field(name=_("Trainer Code"), value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('trainercode',None)}", inline=True)
+    embed.add_field(name=_("Raid Reports"), value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('raid_reports',0)}", inline=True)
+    embed.add_field(name=_("Egg Reports"), value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('egg_reports',0)}", inline=True)
+    embed.add_field(name=_("EX Raid Reports"), value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('ex_reports',0)}", inline=True)
+    embed.add_field(name=_("Wild Reports"), value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('wild_reports',0)}", inline=True)
+    embed.add_field(name=_("Research Reports"), value=f"{guild_dict[ctx.guild.id]['trainers'].setdefault(user.id,{}).get('research_reports',0)}", inline=True)
     await ctx.send(embed=embed)
 
 @Meowth.command()
@@ -4186,13 +4069,13 @@ async def leaderboard(ctx, type="total"):
         user = ctx.guild.get_member(trainer['trainer'])
         if user:
             if guild_dict[ctx.guild.id]['configure_dict']['raid']['enabled']:
-                field_value += f"Raids: **{trainer['raids']}** | Eggs: **{trainer['eggs']}** | "
+                field_value += _("Raids: **{raids}** | Eggs: **{eggs}** | ").format(raids=trainer['raids'], eggs=trainer['eggs'])
             if guild_dict[ctx.guild.id]['configure_dict']['exraid']['enabled']:
-                field_value += f"EX Raids: **{trainer['exraids']}** | "
+                field_value += _("EX Raids: **{exraids}** | ").format(exraids=trainer['exraids'])
             if guild_dict[ctx.guild.id]['configure_dict']['wild']['enabled']:
-                field_value += f"Wilds: **{trainer['wilds']}** | "
+                field_value += _("Wilds: **{wilds}** | ").format(wilds=trainer['wilds'])
             if guild_dict[ctx.guild.id]['configure_dict']['research']['enabled']:
-                field_value += f"Research: **{trainer['research']}** | "
+                field_value += _("Research: **{research}** | ").format(research=trainer['research'])
             embed.add_field(name=f"{rank}. {user.display_name} - {type.title()}: **{trainer[type]}**", value=field_value[:-3], inline=False)
             field_value = ""
             rank += 1
@@ -4200,26 +4083,6 @@ async def leaderboard(ctx, type="total"):
         embed.add_field(name=_("No Reports"), value=_("Nobody has made a report or this report type is disabled."))
     await ctx.send(embed=embed)
 
-@Meowth.command(hidden=True)
-@checks.activeraidchannel()
-async def interest(ctx):
-    await ctx.channel.send(_("Meowth! We've moved this command to **!list interested**."))
-
-@Meowth.command(hidden=True)
-@checks.activeraidchannel()
-async def otw(ctx):
-    await ctx.channel.send(_("Meowth! We've moved this command to **!list coming**."))
-
-@Meowth.command(hidden=True)
-@checks.activeraidchannel()
-async def waiting(ctx):
-    await ctx.channel.send(_("Meowth! We've moved this command to **!list here**."))
-
-@Meowth.command(hidden=True)
-@checks.activeraidchannel()
-async def omw(ctx):
-    await ctx.channel.send(content=_("Meowth! Hey {member}, I don't know if you meant **!coming** to say that you are coming or **!list coming** to see the other trainers on their way").format(member=ctx.author.mention))
-
 """
 Notifications
 """
@@ -4311,6 +4174,7 @@ async def want(ctx,*,pokemon):
             #want_embed = discord.Embed(colour=guild.me.colour)
             #want_embed.set_thumbnail(url=want_img_url)
             #await channel.send(content=_('Meowth! Got it! {member} wants {pokemon}').format(member=ctx.author.mention, pokemon=added_list[0].capitalize()), embed=want_embed)
+            #return
             #If you want reaction
             await ctx.message.add_reaction('☑')
         elif len(already_want_list) == 1:
@@ -4375,9 +4239,9 @@ async def unwant(ctx,*,pokemon):
                 unwant_number = pkmn_info['pokemon_list'].index(entered_unwant) + 1
                 await message.add_reaction('☑')
 
-@unwant.command()
+@unwant.command(name='all')
 @checks.allowwant()
-async def all(ctx):
+async def unwant_all(ctx):
     """Remove all Pokemon from your wanted list.
 
     Usage: !unwant all
@@ -4522,21 +4386,16 @@ async def raid(ctx,pokemon,*,location:commands.clean_content(fix_channel_mention
     Finally, Meowth will create a separate channel for the raid report, for the purposes of organizing the raid."""
     content = f"{pokemon} {location}"
     if pokemon.isdigit():
-        return await _raidegg(ctx.message, content)
+        new_channel = await _raidegg(ctx.message, content)
     else:
-        await _raid(ctx.message, content)
+        new_channel = await _raid(ctx.message, content)
+    ctx.raid_channel = new_channel
 
 async def _raid(message, content, huntr=False):
     fromegg = False
+    if guild_dict[message.channel.guild.id]['raidchannel_dict'].get(message.channel.id,{}).get('type') == "egg":
+        fromegg = True
     timestamp = (message.created_at + datetime.timedelta(hours=guild_dict[message.channel.guild.id]['configure_dict']['settings']['offset'])).strftime(_('%I:%M %p (%H:%M)'))
-    if message.channel.id not in guild_dict[message.guild.id]['configure_dict']['raid']['report_channels'].keys():
-        if (message.channel.id in guild_dict[message.channel.guild.id]['raidchannel_dict']) and (guild_dict[message.channel.guild.id]['raidchannel_dict'][message.channel.id]['type'] == 'egg'):
-            fromegg = True
-            eggdetails = guild_dict[message.guild.id]['raidchannel_dict'][message.channel.id]
-            egglevel = eggdetails['egglevel']
-        else:
-            await message.channel.send(_('Meowth! Please restrict raid reports to a city channel!'))
-            return
     if not huntr:
         raid_split = content.split()
         gymhuntrgps = False
@@ -4627,13 +4486,23 @@ async def _raid(message, content, huntr=False):
     if raid_details == '':
         await message.channel.send(_('Meowth! Give more details when reporting! Usage: **!raid <pokemon name> <location>**'))
         return
+    gyms = get_gyms(message.guild.id)
     if not huntr:
         raid_gmaps_link = create_gmaps_query(raid_details, message.channel, type="raid")
         raid_channel_name = (entered_raid + '-') + sanitize_channel_name(raid_details)
     else:
         raid_gmaps_link = "https://www.google.com/maps/dir/Current+Location/{0}".format(huntr.split("|")[1])
         raid_channel_name = entered_raid + "-" + sanitize_channel_name(raid_details) + "-bot"
-    raid_channel_category = get_category(message.channel, get_level(entered_raid), type="raid")
+    if gyms:
+        match = await gym_match_prompt(message.channel, message.author.id, raid_details, gyms)
+        if not match:
+            return await message.channel.send(_("Meowth! I couldn't find a gym named '{0}'.").format(raid_details))
+        gym = gyms[match]
+        raid_details = match
+        gym_coords = gym['coordinates']
+        gym_note = gym.get('notes', _('No notes for this gym.'))
+        raid_gmaps_link = create_gmaps_query(gym_coords, message.channel, type="raid")
+    raid_channel_category = get_category(message.channel, get_level(entered_raid), category_type="raid")
     raid_channel = await message.guild.create_text_channel(raid_channel_name, overwrites=dict(message.channel.overwrites), category=raid_channel_category)
     ow = raid_channel.overwrites_for(raid_channel.guild.default_role)
     ow.send_messages = True
@@ -4659,6 +4528,9 @@ async def _raid(message, content, huntr=False):
     raid_number = pkmn_info['pokemon_list'].index(entered_raid) + 1
     raid_img_url = 'https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/pkmn/{0}_.png?cache=0'.format(str(raid_number).zfill(3))
     raid_embed = discord.Embed(title=_('Meowth! Click here for directions to the raid!'), url=raid_gmaps_link, colour=message.guild.me.colour)
+    if gyms:
+        gym_info = _("**Name:** {0}\n**Notes:** {1}").format(raid_details, gym_note)
+        raid_embed.add_field(name=_('**Gym:**'), value=gym_info, inline=False)
     raid_embed.add_field(name=_('**Details:**'), value=_('{pokemon} ({pokemonnumber}) {type}').format(pokemon=entered_raid.capitalize(), pokemonnumber=str(raid_number), type=''.join(get_type(message.guild, raid_number)), inline=True))
     raid_embed.add_field(name=_('**Weaknesses:**'), value=_('{weakness_list}').format(weakness_list=weakness_to_str(message.guild, get_weaknesses(entered_raid))), inline=True)
     raid_embed.add_field(name=_('**Next Group:**'), value=_('Set with **!starttime**'), inline=True)
@@ -4670,28 +4542,31 @@ async def _raid(message, content, huntr=False):
     report_embed = raid_embed
     raidreport = await message.channel.send(content=_('Meowth! {pokemon} raid reported by {member}! Details: {location_details}. Coordinate in {raid_channel}').format(pokemon=entered_raid.capitalize(), member=message.author.mention, location_details=raid_details, raid_channel=raid_channel.mention), embed=report_embed)
     await asyncio.sleep(1)
-    raidmsg = _("{roletest}Meowth! {pokemon} raid reported by {member} in {citychannel}! Details: {location_details}. Coordinate here!\n\nTo update your status, choose from the following commands: **!maybe**, **!coming**, **!here**, **!cancel**. If you are bringing more than one trainer/account, add in the number of accounts total, teams optional, on your first status update.\nExample: `!coming 5 2m 2v 1i`\n\nTo see the list of trainers who have given their status:\n**!list interested**, **!list coming**, **!list here** or use just **!list** to see all lists. Use **!list teams** to see team distribution.\n\nSometimes I'm not great at directions, but I'll correct my directions if anybody sends me a maps link or uses **!location new <address>**. You can see the location of a raid by using **!location**\n\nYou can set the time remaining with **!timerset <minutes>** and access this with **!timer**.\nYou can set the start time with **!starttime [HH:MM AM/PM]** (you can also omit AM/PM and use 24-hour time) and access this with **!starttime**.\n\nMessage **!starting** when the raid is beginning to clear the raid's 'here' list.\n\nThis channel will be deleted five minutes after the timer expires.").format(roletest=roletest, pokemon=entered_raid.title(), member=message.author.mention, citychannel=message.channel.mention, location_details=raid_details)
+    raidmsg = _("{roletest}Meowth! {pokemon} raid reported by {member} in {citychannel}! Details: {location_details}. Coordinate here!\n\nClick the question mark reaction to get help on the commands that work in here.\n\nThis channel will be deleted five minutes after the timer expires.").format(roletest=roletest, pokemon=entered_raid.title(), member=message.author.mention, citychannel=message.channel.mention, location_details=raid_details)
     raidmessage = await raid_channel.send(content=raidmsg, embed=raid_embed)
+    await raidmessage.add_reaction('\u2754')
     await raidmessage.pin()
     level = get_level(entered_raid)
     if str(level) in guild_dict[message.guild.id]['configure_dict']['counters']['auto_levels']:
-        ctrs_dict = await _get_generic_counters(message.guild, entered_raid, weather)
-        ctrsmsg = "Here are the best counters for the raid boss in currently known weather conditions! Update weather with **!weather**. If you know the moveset of the boss, you can react to this message with the matching emoji and I will update the counters."
-        ctrsmessage = await raid_channel.send(content=ctrsmsg,embed=ctrs_dict[0]['embed'])
-        ctrsmessage_id = ctrsmessage.id
-        await ctrsmessage.pin()
-        for moveset in ctrs_dict:
-            await ctrsmessage.add_reaction(ctrs_dict[moveset]['emoji'])
-            await asyncio.sleep(0.25)
+        try:
+            ctrs_dict = await _get_generic_counters(message.guild, entered_raid, weather)
+            ctrsmsg = "Here are the best counters for the raid boss in currently known weather conditions! Update weather with **!weather**. If you know the moveset of the boss, you can react to this message with the matching emoji and I will update the counters."
+            ctrsmessage = await raid_channel.send(content=ctrsmsg,embed=ctrs_dict[0]['embed'])
+            ctrsmessage_id = ctrsmessage.id
+            await ctrsmessage.pin()
+            for moveset in ctrs_dict:
+                await ctrsmessage.add_reaction(ctrs_dict[moveset]['emoji'])
+                await asyncio.sleep(0.25)
+        except:
+            ctrs_dict = {}
+            ctrsmessage_id = None
     else:
         ctrs_dict = {}
         ctrsmessage_id = None
     guild_dict[message.guild.id]['raidchannel_dict'][raid_channel.id] = {
         'reportcity': message.channel.id,
-        'trainer_dict': {
-
-        },
-        'exp': time.time() + (60 * raid_info['raid_eggs'][get_level(entered_raid)]['raidtime']),
+        'trainer_dict': {},
+        'exp': time.time() + (60 * raid_info['raid_eggs'][str(level)]['raidtime']),
         'manual_timer': False,
         'active': True,
         'raidmessage': raidmessage.id,
@@ -4743,7 +4618,7 @@ async def _raidegg(message, content, huntr=False):
         raidexp = int(raidegg_split[(- 1)])
         del raidegg_split[(- 1)]
     elif ':' in raidegg_split[(- 1)]:
-        msg = _("Did you mean egg hatch time 🥚 or time remaining before hatch ⏲?")
+        msg = _("Did you mean egg hatch time {0} or time remaining before hatch {1}?").format("🥚", "⏲")
         question = await message.channel.send(msg)
         try:
             timeout = False
@@ -4798,6 +4673,16 @@ async def _raidegg(message, content, huntr=False):
         raid_gmaps_link = create_gmaps_query(raid_details, message.channel, type="raid")
     else:
         raid_gmaps_link = "https://www.google.com/maps/dir/Current+Location/{0}".format(huntr.split("|")[1])
+    gyms = get_gyms(message.guild.id)
+    if gyms:
+        match = await gym_match_prompt(message.channel, message.author.id, raid_details, gyms)
+        if not match:
+            return await message.channel.send(_("Meowth! I couldn't find a gym named '{0}'.").format(raid_details))
+        gym = gyms[match]
+        raid_details = match
+        gym_coords = gym['coordinates']
+        gym_note = gym.get('notes', _('No notes for this gym.'))
+        raid_gmaps_link = create_gmaps_query(gym_coords, message.channel, type="raid")
     if (egg_level > 5) or (egg_level == 0):
         await message.channel.send(_('Meowth! Raid egg levels are only from 1-5!'))
         return
@@ -4812,9 +4697,7 @@ async def _raidegg(message, content, huntr=False):
             boss_list.append((((p_name + ' (') + str(p)) + ') ') + ''.join(p_type))
         raid_channel_name = _('level-{egg_level}-egg-').format(egg_level=egg_level)
         raid_channel_name += sanitize_channel_name(raid_details)
-        if huntr:
-            raid_channel_name += _('-bot')
-        raid_channel_category = get_category(message.channel, egg_level, type="raid")
+        raid_channel_category = get_category(message.channel, egg_level, category_type="raid")
         raid_channel = await message.guild.create_text_channel(raid_channel_name, overwrites=dict(message.channel.overwrites), category=raid_channel_category)
         ow = raid_channel.overwrites_for(raid_channel.guild.default_role)
         ow.send_messages = True
@@ -4834,6 +4717,9 @@ async def _raidegg(message, content, huntr=False):
                     pass
         raid_img_url = 'https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/eggs/{}?cache=0'.format(str(egg_img))
         raid_embed = discord.Embed(title=_('Meowth! Click here for directions to the coming raid!'), url=raid_gmaps_link, colour=message.guild.me.colour)
+        if gyms:
+            gym_info = _("**Name:** {0}\n**Notes:** {1}").format(raid_details, gym_note)
+            raid_embed.add_field(name=_('**Gym:**'), value=gym_info, inline=False)
         if len(egg_info['pokemon']) > 1:
             raid_embed.add_field(name=_('**Possible Bosses:**'), value=_('{bosslist1}').format(bosslist1='\n'.join(boss_list[::2])), inline=True)
             raid_embed.add_field(name='\u200b', value=_('{bosslist2}').format(bosslist2='\n'.join(boss_list[1::2])), inline=True)
@@ -4848,8 +4734,9 @@ async def _raidegg(message, content, huntr=False):
         raid_embed.set_thumbnail(url=raid_img_url)
         raidreport = await message.channel.send(content=_('Meowth! Level {level} raid egg reported by {member}! Details: {location_details}. Coordinate in {raid_channel}').format(level=egg_level, member=message.author.mention, location_details=raid_details, raid_channel=raid_channel.mention), embed=raid_embed)
         await asyncio.sleep(1)
-        raidmsg = _("Meowth! Level {level} raid egg reported by {member} in {citychannel}! Details: {location_details}. Coordinate here!\n\nTo update your status, choose from the following commands: **!maybe**, **!coming**, **!here**, **!cancel**. If you are bringing more than one trainer/account, add in the number of accounts total, teams optional, on your first status update.\nExample: `!coming 5 2m 2v 1i`\n\nTo see the list of trainers who have given their status:\n**!list interested**, **!list coming**, **!list here** or use just **!list** to see all lists. Use **!list teams** to see team distribution.\n\nSometimes I'm not great at directions, but I'll correct my directions if anybody sends me a maps link or uses **!location new <address>**. You can see the location of a raid by using **!location**\n\nYou can set the time remaining with **!timerset <minutes>** and access this with **!timer**.\nYou can set the start time with **!starttime [HH:MM AM/PM]** (you can also omit AM/PM and use 24-hour time) and access this with **!starttime**.\n\nMessage **!starting** when the raid is beginning to clear the raid's 'here' list.\n\nThis channel will be deleted five minutes after the timer expires.").format(level=egg_level, member=message.author.mention, citychannel=message.channel.mention, location_details=raid_details)
+        raidmsg = _("Meowth! Level {level} raid egg reported by {member} in {citychannel}! Details: {location_details}. Coordinate here!\n\nClick the question mark reaction to get help on the commands that work in here.\n\nThis channel will be deleted five minutes after the timer expires.").format(level=egg_level, member=message.author.mention, citychannel=message.channel.mention, location_details=raid_details)
         raidmessage = await raid_channel.send(content=raidmsg, embed=raid_embed)
+        await raidmessage.add_reaction('\u2754')
         await raidmessage.pin()
         guild_dict[message.guild.id]['raidchannel_dict'][raid_channel.id] = {
             'reportcity': message.channel.id,
@@ -5015,11 +4902,11 @@ async def _eggtoraid(entered_raid, raid_channel, author=None, huntr=None):
     if (not raid_match):
         await raid_channel.send(_('Meowth! The Pokemon {pokemon} does not appear in raids!').format(pokemon=entered_raid.capitalize()))
         return
-    elif get_number(entered_raid) not in raid_info['raid_eggs'][egglevel]['pokemon']:
+    elif get_number(entered_raid) not in raid_info['raid_eggs'][str(egglevel)]['pokemon']:
         await raid_channel.send(_('Meowth! The Pokemon {pokemon} does not hatch from level {level} raid eggs!').format(pokemon=entered_raid.capitalize(), level=egglevel))
         return
     if (egglevel.isdigit() and int(egglevel) > 0) or egglevel == 'EX':
-        raidexp = eggdetails['exp'] + 60 * raid_info['raid_eggs'][egglevel]['raidtime']
+        raidexp = eggdetails['exp'] + 60 * raid_info['raid_eggs'][str(egglevel)]['raidtime']
     else:
         raidexp = eggdetails['exp']
     end = datetime.datetime.utcfromtimestamp(raidexp) + datetime.timedelta(hours=guild_dict[raid_channel.guild.id]['configure_dict']['settings']['offset'])
@@ -5035,7 +4922,7 @@ async def _eggtoraid(entered_raid, raid_channel, author=None, huntr=None):
     if egglevel.isdigit():
         hatchtype = 'raid'
         raidreportcontent = _('Meowth! The egg has hatched into a {pokemon} raid! Details: {location_details}. Coordinate in {raid_channel}').format(pokemon=entered_raid.capitalize(), location_details=egg_address, raid_channel=raid_channel.mention)
-        raidmsg = _("Meowth! The egg reported by {member} in {citychannel} hatched into a {pokemon} raid! Details: {location_details}. Coordinate here!\n\nTo update your status, choose from the following commands: **!maybe**, **!coming**, **!here**, **!cancel**. If you are bringing more than one trainer/account, add in the number of accounts total, teams optional, on your first status update.\nExample: `!coming 5 2m 2v 1i`\n\nTo see the list of trainers who have given their status:\n**!list interested**, **!list coming**, **!list here** or use just **!list** to see all lists. Use **!list teams** to see team distribution.\n\nSometimes I'm not great at directions, but I'll correct my directions if anybody sends me a maps link or uses **!location new <address>**. You can see the location of a raid by using **!location**\n\nYou can set the time remaining with **!timerset <minutes>** and access this with **!timer**.\nYou can set the start time with **!starttime [HH:MM AM/PM]** (you can also omit AM/PM and use 24-hour time) and access this with **!starttime**.\n\nMessage **!starting** when the raid is beginning to clear the raid's 'here' list.\n\nThis channel will be deleted five minutes after the timer expires.").format(member=raid_messageauthor.mention, citychannel=reportcitychannel.mention, pokemon=entered_raid.capitalize(), location_details=egg_address)
+        raidmsg = _("Meowth! The egg reported by {member} in {citychannel} hatched into a {pokemon} raid! Details: {location_details}. Coordinate here!\n\nClick the question mark reaction to get help on the commands that work in here.\n\nThis channel will be deleted five minutes after the timer expires.").format(member=raid_messageauthor.mention, citychannel=reportcitychannel.mention, pokemon=entered_raid.capitalize(), location_details=egg_address)
     elif egglevel == 'EX':
         hatchtype = 'exraid'
         if guild_dict[raid_channel.guild.id]['configure_dict']['invite']['enabled']:
@@ -5045,7 +4932,7 @@ async def _eggtoraid(entered_raid, raid_channel, author=None, huntr=None):
             invitemsgstr = _("Coordinate")
             invitemsgstr2 = ""
         raidreportcontent = _('Meowth! The EX egg has hatched into a {pokemon} raid! Details: {location_details}. {invitemsgstr} coordinate in {raid_channel}').format(pokemon=entered_raid.capitalize(), location_details=egg_address, invitemsgstr=invitemsgstr,raid_channel=raid_channel.mention)
-        raidmsg = _("Meowth! {pokemon} EX raid reported by {member} in {citychannel}! Details: {location_details}. Coordinate here{invitemsgstr2}!\n\nTo update your status, choose from the following commands: **!maybe**, **!coming**, **!here**, **!cancel**. If you are bringing more than one trainer/account, add in the number of accounts total, teams optional, on your first status update.\nExample: `!coming 5 2m 2v 1i`\n\nTo see the list of trainers who have given their status:\n**!list interested**, **!list coming**, **!list here** or use just **!list** to see all lists. Use **!list teams** to see team distribution.\n\nSometimes I'm not great at directions, but I'll correct my directions if anybody sends me a maps link or uses **!location new <address>**. You can see the location of a raid by using **!location**\n\nYou can set the time remaining with **!timerset <minutes>** and access this with **!timer**.\nYou can set the start time with **!starttime [HH:MM AM/PM]** (you can also omit AM/PM and use 24-hour time) and access this with **!starttime**.\n\nMessage **!starting** when the raid is beginning to clear the raid's 'here' list.\n\nThis channel will be deleted five minutes after the timer expires.").format(pokemon=entered_raid.capitalize(), member=raid_messageauthor.mention, citychannel=reportcitychannel.mention, location_details=egg_address, invitemsgstr2=invitemsgstr2)
+        raidmsg = _("Meowth! {pokemon} EX raid reported by {member} in {citychannel}! Details: {location_details}. Coordinate here{invitemsgstr2}!\n\nClick the question mark reaction to get help on the commands that work in here.\n\nThis channel will be deleted five minutes after the timer expires.").format(pokemon=entered_raid.capitalize(), member=raid_messageauthor.mention, citychannel=reportcitychannel.mention, location_details=egg_address, invitemsgstr2=invitemsgstr2)
     raid_channel_name = (entered_raid + '-') + sanitize_channel_name(egg_address)
     raid = discord.utils.get(raid_channel.guild.roles, name=entered_raid)
     if raid == None:
@@ -5210,7 +5097,7 @@ async def _exraid(ctx, location):
     meowth_overwrite = (Meowth.user, discord.PermissionOverwrite(send_messages=True, read_messages=True, manage_roles=True))
     raid_channel_overwrite_list.append(meowth_overwrite)
     raid_channel_overwrites = dict(raid_channel_overwrite_list)
-    raid_channel_category = get_category(message.channel,"EX", type="exraid")
+    raid_channel_category = get_category(message.channel,"EX", category_type="exraid")
     raid_channel = await message.guild.create_text_channel(raid_channel_name, overwrites=raid_channel_overwrites,category=raid_channel_category)
     if guild_dict[channel.guild.id]['configure_dict']['invite']['enabled']:
         for role in channel.guild.role_hierarchy:
@@ -5244,8 +5131,9 @@ async def _exraid(ctx, location):
         invitemsgstr2 = ""
     raidreport = await channel.send(content=_('Meowth! EX raid egg reported by {member}! Details: {location_details}. {invitemsgstr} in {raid_channel}').format(member=message.author.mention, location_details=raid_details, invitemsgstr=invitemsgstr,raid_channel=raid_channel.mention), embed=raid_embed)
     await asyncio.sleep(1)
-    raidmsg = _("Meowth! EX raid reported by {member} in {citychannel}! Details: {location_details}. Coordinate here{invitemsgstr2}!\n\nTo update your status, choose from the following commands: **!maybe**, **!coming**, **!here**, **!cancel**. If you are bringing more than one trainer/account, add in the number of accounts total, teams optional, on your first status update.\nExample: `!coming 5 2m 2v 1i`\n\nTo see the list of trainers who have given their status:\n**!list interested**, **!list coming**, **!list here** or use just **!list** to see all lists. Use **!list teams** to see team distribution.\n\nSometimes I'm not great at directions, but I'll correct my directions if anybody sends me a maps link or uses **!location new <address>**. You can see the location of a raid by using **!location**\n\nYou can set the hatch time with **!timerset <MM/DD HH:MM AM/PM>** and access this with **!timer**.\nYou can set the start time with **!starttime [HH:MM AM/PM]** (you can also omit AM/PM and use 24-hour time) and access this with **!starttime**.\n\nMessage **!starting** when the raid is beginning to clear the raid's 'here' list.\n\nThis channel will be deleted five minutes after the timer expires.").format(member=message.author.mention, citychannel=message.channel.mention, location_details=raid_details, invitemsgstr2=invitemsgstr2)
+    raidmsg = _("Meowth! EX raid reported by {member} in {citychannel}! Details: {location_details}. Coordinate here{invitemsgstr2}!\n\nClick the question mark reaction to get help on the commands that work in here.\n\nThis channel will be deleted five minutes after the timer expires.").format(member=message.author.mention, citychannel=message.channel.mention, location_details=raid_details, invitemsgstr2=invitemsgstr2)
     raidmessage = await raid_channel.send(content=raidmsg, embed=raid_embed)
+    await raidmessage.add_reaction('\u2754')
     await raidmessage.pin()
     guild_dict[message.guild.id]['raidchannel_dict'][raid_channel.id] = {
         'reportcity': channel.id,
@@ -5279,20 +5167,6 @@ async def invite(ctx):
     Usage: !invite"""
     await _invite(ctx)
 
-def invite_processing(invite_bytes: bytes) -> BytesIO:
-    with Image.open(BytesIO(invite_bytes)) as img:
-        (width, height) = img.size
-        new_height = 3500
-        new_width = int((new_height * width) / height)
-        img = img.resize((new_width, new_height), Image.BICUBIC)
-        img = img.filter(ImageFilter.EDGE_ENHANCE)
-        enh = ImageEnhance.Brightness(img)
-        img = enh.enhance(0.4)
-        enh = ImageEnhance.Contrast(img)
-        img = enh.enhance(4)
-        txt = pytesseract.image_to_string(img, config=tesseract_config)
-    return txt
-
 async def _invite(ctx):
     bot = ctx.bot
     channel = ctx.channel
@@ -5368,7 +5242,7 @@ async def research(ctx, *, details = None):
     research_embed.set_footer(text=_('Reported by @{author} - {timestamp}').format(author=author.display_name, timestamp=timestamp.strftime(_('%I:%M %p (%H:%M)'))), icon_url=author.avatar_url_as(format=None, static_format='jpg', size=32))
     while True:
         if details:
-            research_split = details.split(", ")
+            research_split = details.rsplit(",", 2)
             if len(research_split) != 3:
                 error = _("entered an incorrect amount of arguments.\n\nUsage: **!research** or **!research <pokestop>, <quest>, <reward>**")
                 break
@@ -5458,7 +5332,7 @@ async def research(ctx, *, details = None):
             'reportchannel':channel.id,
             'reportauthor':author.id,
             'location':location,
-            'url': loc_url,
+            'url':loc_url,
             'quest':quest,
             'reward':reward
         }
@@ -5467,7 +5341,7 @@ async def research(ctx, *, details = None):
         guild_dict[ctx.guild.id]['trainers'][author.id]['research_reports'] = research_reports
     else:
         research_embed.clear_fields()
-        research_embed.add_field(name='**Research Report Cancelled**', value=_("Meowth! Your report has been cancelled because you {error}! Retry when you're ready.").format(error=error), inline=False)
+        research_embed.add_field(name=_('**Research Report Cancelled**'), value=_("Meowth! Your report has been cancelled because you {error}! Retry when you're ready.").format(error=error), inline=False)
         confirmation = await channel.send(embed=research_embed)
         await asyncio.sleep(10)
         await confirmation.delete()
@@ -5499,7 +5373,7 @@ async def _meetup(ctx, location):
     egg_info = raid_info['raid_eggs']['EX']
     raid_channel_name = _('meetup-')
     raid_channel_name += sanitize_channel_name(raid_details)
-    raid_channel_category = get_category(message.channel,"EX", type="meetup")
+    raid_channel_category = get_category(message.channel,"EX", category_type="meetup")
     raid_channel = await message.guild.create_text_channel(raid_channel_name, overwrites=dict(message.channel.overwrites), category=raid_channel_category)
     ow = raid_channel.overwrites_for(raid_channel.guild.default_role)
     ow.send_messages = True
@@ -5607,7 +5481,7 @@ async def timerset(ctx, *,timer):
         if timer.isdigit():
             raidexp = int(timer)
         elif type == 'egg' and ':' in timer:
-            msg = _("Did you mean egg hatch time 🥚 or time remaining before hatch ⏲?")
+            msg = _("Did you mean egg hatch time {0} or time remaining before hatch {1}?").format("🥚", "⏲")
             question = await ctx.channel.send(msg)
             try:
                 timeout = False
@@ -6158,13 +6032,10 @@ async def duplicate(ctx):
     rc_d = guild_dict[guild.id]['raidchannel_dict'][channel.id]
     t_dict = rc_d['trainer_dict']
     can_manage = channel.permissions_for(author).manage_channels
-    reporters = []
-    raidtype = "event" if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else "raid"
+    raidtype = _("event") if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else _("raid")
     if can_manage:
         dupecount = 2
         rc_d['duplicate'] = dupecount
-        if author.mention not in reporters:
-            reporters.append(author.mention)
     else:
         if author.id in t_dict:
             try:
@@ -6426,11 +6297,12 @@ def clean(txt):
             moveset = ctr['byMove'][-1]
             moves = _("{move1} | {move2}").format(move1=clean(moveset['move1'])[:-5], move2=clean(moveset['move2']))
             name = _("#{index} - {ctr_name}").format(index=index, ctr_name=(ctr_nick or ctr_name))
-            ctrs_embed.add_field(name=name,value=f"CP: {ctr_cp}\n{moves}")
+            cpstr = _("CP")
+            ctrs_embed.add_field(name=name,value=f"{cpstr}: {ctr_cp}\n{moves}")
             index += 1
         ctrs_embed.add_field(name=_("Results with {userstr} attackers").format(userstr=userstr), value=_("[See your personalized results!](https://www.pokebattler.com/raids/{pkmn})").format(pkmn=pkmn.replace('-','_').upper()))
         if user:
-            ctrs_embed.add_field(name=_("Pokebattler Estimator:"), value=_(f"Difficulty rating: {est}"))
+            ctrs_embed.add_field(name=_("Pokebattler Estimator:"), value=_("Difficulty rating: {est}").format(est=est))
             await ctx.author.send(embed=ctrs_embed)
             return
         await ctx.channel.send(embed=ctrs_embed)
@@ -6492,7 +6364,7 @@ def clean(txt):
         move2 = moveset['move2'].lower().title().replace('_', ' ')
         movesetstr = f'{move1} | {move2}'
         ctrs = moveset['defenders'][-6:]
-        title = _(f'{pkmn.title()} | {weather_list[index].title()} | {movesetstr}')
+        title = _('{pkmn} | {weather} | {movesetstr}').format(pkmn=pkmn.title(), weather=weather_list[index].title(), movesetstr=movesetstr)
         ctrs_embed = discord.Embed(colour=guild.me.colour)
         ctrs_embed.set_author(name=title,url=title_url,icon_url=hyperlink_icon)
         ctrs_embed.set_thumbnail(url=img_url)
@@ -6511,7 +6383,7 @@ def clean(txt):
         moveset_list.append(f"{ctrs_dict[moveset]['emoji']}: {ctrs_dict[moveset]['moveset']}\n")
     for moveset in ctrs_dict:
         ctrs_split = int(round(len(moveset_list)/2+0.1))
-        ctrs_dict[moveset]['embed'].add_field(name="**Possible Movesets:**", value=f"{''.join(moveset_list[:ctrs_split])}", inline=True)
+        ctrs_dict[moveset]['embed'].add_field(name=_("**Possible Movesets:**"), value=f"{''.join(moveset_list[:ctrs_split])}", inline=True)
         ctrs_dict[moveset]['embed'].add_field(name="\u200b", value=f"{''.join(moveset_list[ctrs_split:])}",inline=True)
         ctrs_dict[moveset]['embed'].add_field(name=_("Results with Level 30 attackers"), value=_("[See your personalized results!](https://www.pokebattler.com/raids/{pkmn})").format(pkmn=pkmn.replace('-','_').upper()),inline=False)
 
@@ -6520,7 +6392,10 @@ def clean(txt):
 @Meowth.command()
 @checks.activechannel()
 async def weather(ctx, *, weather):
-    "Sets the weather for the raid. \nUsage: !weather <weather> \nOnly usable in raid channels. \n Acceptable options: none, extreme, clear, rainy, partlycloudy, cloudy, windy, snow, fog"
+    """Sets the weather for the raid.
+    Usage: !weather <weather>
+    Only usable in raid channels.
+    Acceptable options: none, extreme, clear, rainy, partlycloudy, cloudy, windy, snow, fog"""
     weather_list = [_('none'), _('extreme'), _('clear'), _('sunny'), _('rainy'),
                     _('partlycloudy'), _('cloudy'), _('windy'), _('snow'), _('fog')]
     if weather.lower() not in weather_list:
@@ -6571,6 +6446,7 @@ async def interested(ctx, *, teamcounts: str=None):
     rgx = '[^a-zA-Z0-9]'
     if teamcounts:
         if "all" in teamcounts.lower():
+            # What a hack
             teamcounts = "{teamcounts} {bosslist}".format(teamcounts=teamcounts,bosslist=" ".join([get_name(s).title() for s in raid_info['raid_eggs'][egglevel]['pokemon']]))
             teamcounts = teamcounts.lower().replace("all","").strip()
         pkmn_match = next((p for p in pkmn_info['pokemon_list'] if re.sub(rgx, '', p) in re.sub(rgx, '', teamcounts.lower())), None)
@@ -6585,6 +6461,8 @@ async def interested(ctx, *, teamcounts: str=None):
                     await ctx.message.channel.send(_("{word} doesn't appear in level {egglevel} raids! Please try again.").format(word=word.title(),egglevel=egglevel))
                     return
                 teamcounts = teamcounts.lower().replace(word.lower(),"").replace(",","").strip()
+    elif not pkmn_match and guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['type'] == 'egg':
+        entered_interest = [get_name(p) for p in raid_info['raid_eggs'][egglevel]['pokemon']]
     if teamcounts and teamcounts.split()[0].isdigit():
         total = int(teamcounts.split()[0])
     elif (ctx.author.id in trainer_dict) and (sum(trainer_dict[ctx.author.id]['status'].values()) > 0):
@@ -6667,23 +6545,20 @@ async def coming(ctx, *, teamcounts: str=None):
         pkmn_match = next((p for p in pkmn_info['pokemon_list'] if re.sub(rgx, '', p) in re.sub(rgx, '', teamcounts.lower())), None)
     if pkmn_match and guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['type'] == "egg":
         entered_interest = []
+        unmatched_mons = False
         for word in re.split(' |,', teamcounts.lower()):
             if word.lower() in pkmn_info['pokemon_list']:
-                if get_number(word.lower()) in raid_info['raid_eggs'][egglevel]['pokemon']:
-                    if word.lower() not in entered_interest:
-                        entered_interest.append(word.lower())
-                else:
-                    await ctx.message.channel.send(_("{word} doesn't appear in level {egglevel} raids! Please try again.").format(word=word.title(),egglevel=egglevel))
-                    return
+                if word.lower() not in entered_interest:
+                    entered_interest.append(word.lower())
+                    if not get_number(word.lower()) in raid_info['raid_eggs'][egglevel]['pokemon']:
+                        await ctx.message.channel.send(_("{word} doesn't appear in level {egglevel} raids!").format(word=word.title(),egglevel=egglevel))
+                        unmatched_mons = True
                 teamcounts = teamcounts.lower().replace(word.lower(),"").replace(",","").strip()
-    else:
-        try:
-            if guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['type'] == 'egg' and not checks.check_meetupchannel(ctx):
-                if guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['pokemon'] == '' and not entered_interest:
-                    await ctx.channel.send(_("Meowth! Specify which of the possible bosses you are interested in! Otherwise, please wait until the raid egg has hatched before announcing you're coming or present."))
-                    return
-        except:
-            pass
+        if unmatched_mons:
+            await ctx.message.channel.send(_("Invalid Pokemon detected. Please check the pinned message for the list of possible bosses and try again."))
+            return
+    elif not pkmn_match and guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['type'] == 'egg':
+        entered_interest = [get_name(p) for p in raid_info['raid_eggs'][egglevel]['pokemon']]
     trainer_dict = guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['trainer_dict']
     if (not teamcounts):
         if ctx.author.id in trainer_dict:
@@ -6786,14 +6661,8 @@ async def here(ctx, *, teamcounts: str=None):
                     await ctx.message.channel.send(_("{word} doesn't appear in level {egglevel} raids! Please try again.").format(word=word.title(),egglevel=egglevel))
                     return
                 teamcounts = teamcounts.lower().replace(word.lower(),"").replace(",","").strip()
-    else:
-        try:
-            if guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['type'] == 'egg' and not checks.check_meetupchannel(ctx):
-                if guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['pokemon'] == '' and not entered_interest:
-                    await ctx.channel.send(_("Meowth! Specify which of the possible bosses you are interested in! Otherwise, please wait until the raid egg has hatched before announcing you're coming or present."))
-                    return
-        except:
-            pass
+    elif not pkmn_match and guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['type'] == 'egg':
+        entered_interest = [get_name(p) for p in raid_info['raid_eggs'][egglevel]['pokemon']]
 
     if (not teamcounts):
         if ctx.author.id in trainer_dict:
@@ -6826,7 +6695,7 @@ async def _here(channel, author, count, party, entered_interest=None):
     allyellow = 0
     allunknown = 0
     trainer_dict = guild_dict[channel.guild.id]['raidchannel_dict'][channel.id]['trainer_dict']
-    raidtype = "event" if guild_dict[channel.guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else "raid"
+    raidtype = _("event") if guild_dict[channel.guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else _("raid")
     try:
         if guild_dict[channel.guild.id]['raidchannel_dict'][channel.id]['lobby']:
             lobbymsg += _('\nThere is a group already in the lobby! Use **!lobby** to join them or **!backout** to request a backout! Otherwise, you may have to wait for the next group!')
@@ -6874,13 +6743,13 @@ async def _party_status(ctx, total, teamcounts):
     channel = ctx.channel
     author = ctx.author
     for role in ctx.author.roles:
-        if role.id == guild_dict[channel.guild.id]['configure_dict']['team']['team_roles']['mystic']:
+        if role.name.lower() == 'mystic':
             my_team = 'mystic'
             break
-        elif role.id == guild_dict[channel.guild.id]['configure_dict']['team']['team_roles']['valor']:
+        elif role.name.lower() == 'valor':
             my_team = 'valor'
             break
-        elif role.id == guild_dict[channel.guild.id]['configure_dict']['team']['team_roles']['instinct']:
+        elif role.name.lower() == 'instinct':
             my_team = 'instinct'
             break
     else:
@@ -7009,7 +6878,7 @@ async def _edit_party(channel, author=None):
         s = _('status')
         if (t not in field.name.lower()) and (s not in field.name.lower()):
             newembed.add_field(name=field.name, value=field.value, inline=field.inline)
-    if egglevel != "0" and not guild_dict[channel.guild.id].get('raidchannel_dict',{}).get(channel.id,{}).get('meetup', {}):
+    if egglevel != "0" and not guild_dict[channel.guild.id].get('raidchannel_dict',{}).get(channel.id,{}).get('meetup',{}):
         if len(boss_list) > 1:
             newembed.set_field_at(0, name=_("**Boss Interest:**") if channel_dict["boss"] > 0 else _("**Possible Bosses:**"), value=_('{bosslist1}').format(bosslist1='\n'.join(display_list[::2])), inline=True)
             newembed.set_field_at(1, name='\u200b', value=_('{bosslist2}').format(bosslist2='\n'.join(display_list[1::2])), inline=True)
@@ -7090,7 +6959,7 @@ async def cancel(ctx):
 
 async def _cancel(channel, author):
     guild = channel.guild
-    raidtype = "event" if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else "raid"
+    raidtype = _("event") if guild_dict[guild.id]['raidchannel_dict'][channel.id].get('meetup',False) else _("raid")
     try:
         t_dict = guild_dict[guild.id]['raidchannel_dict'][channel.id]['trainer_dict'][author.id]
     except KeyError:
@@ -7122,6 +6991,32 @@ async def _cancel(channel, author):
     t_dict['count'] = 1
     await _edit_party(channel, author)
 
+async def lobby_countdown(ctx):
+    await asyncio.sleep(120)
+    if ('lobby' not in guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]) or (time.time() < guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['lobby']['exp']):
+        return
+    ctx_lobbycount = 0
+    trainer_delete_list = []
+    for trainer in ctx.trainer_dict:
+        if ctx.trainer_dict[trainer]['status']['lobby']:
+            ctx_lobbycount += ctx.trainer_dict[trainer]['status']['lobby']
+            trainer_delete_list.append(trainer)
+    if ctx_lobbycount > 0:
+        await ctx.channel.send(_('Meowth! The group of {count} in the lobby has entered the raid! Wish them luck!').format(count=str(ctx_lobbycount)))
+    for trainer in trainer_delete_list:
+        if team in ctx.team_names:
+            ctx.trainer_dict[trainer]['status'] = {'maybe':0, 'coming':0, 'here':herecount - teamcount, 'lobby': lobbycount}
+            ctx.trainer_dict[trainer]['party'][team] = 0
+            ctx.trainer_dict[trainer]['count'] = ctx.trainer_dict[trainer]['count'] - teamcount
+        else:
+            del ctx.trainer_dict[trainer]
+    try:
+        del guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['lobby']
+    except KeyError:
+        pass
+    await _edit_party(ctx.channel, ctx.author)
+    guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['trainer_dict'] = ctx.trainer_dict
+
 @Meowth.command()
 @checks.activeraidchannel()
 async def starting(ctx, team: str = ''):
@@ -7134,9 +7029,9 @@ async def starting(ctx, team: str = ''):
     id_startinglist = []
     name_startinglist = []
     team_list = []
-    team_names = ["mystic","valor","instinct","unknown"]
-    team = team if team and team.lower() in team_names else "all"
-    trainer_dict = copy.deepcopy(guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['trainer_dict'])
+    ctx.team_names = ["mystic", "valor", "instinct", "unknown"]
+    team = team if team and team.lower() in ctx.team_names else "all"
+    ctx.trainer_dict = copy.deepcopy(guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['trainer_dict'])
     if guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id].get('type',None) == 'egg':
         starting_str = _("Meowth! How can you start when the egg hasn't hatched!?")
         await ctx.channel.send(starting_str)
@@ -7145,23 +7040,23 @@ async def starting(ctx, team: str = ''):
         starting_str = _("Meowth! Please wait for the group in the lobby to enter the raid.")
         await ctx.channel.send(starting_str)
         return
-    for trainer in trainer_dict:
-        count = trainer_dict[trainer]['count']
+    for trainer in ctx.trainer_dict:
+        count = ctx.trainer_dict[trainer]['count']
         user = ctx.guild.get_member(trainer)
-        if team in team_names:
-            if trainer_dict[trainer]['party'][team]:
+        if team in ctx.team_names:
+            if ctx.trainer_dict[trainer]['party'][team]:
                 team_list.append(user.id)
-            teamcount = trainer_dict[trainer]['party'][team]
-            herecount = trainer_dict[trainer]['status']['here']
-            lobbycount = trainer_dict[trainer]['status']['lobby']
-            if trainer_dict[trainer]['status']['here'] and (user.id in team_list):
-                trainer_dict[trainer]['status'] = {'maybe':0, 'coming':0, 'here':herecount - teamcount, 'lobby':lobbycount + teamcount}
+            teamcount = ctx.trainer_dict[trainer]['party'][team]
+            herecount = ctx.trainer_dict[trainer]['status']['here']
+            lobbycount = ctx.trainer_dict[trainer]['status']['lobby']
+            if ctx.trainer_dict[trainer]['status']['here'] and (user.id in team_list):
+                ctx.trainer_dict[trainer]['status'] = {'maybe':0, 'coming':0, 'here':herecount - teamcount, 'lobby':lobbycount + teamcount}
                 ctx_startinglist.append(user.mention)
                 name_startinglist.append('**'+user.display_name+'**')
                 id_startinglist.append(trainer)
         else:
-            if trainer_dict[trainer]['status']['here'] and (user.id in team_list or team == "all"):
-                trainer_dict[trainer]['status'] = {'maybe':0, 'coming':0, 'here':0, 'lobby':count}
+            if ctx.trainer_dict[trainer]['status']['here'] and (user.id in team_list or team == "all"):
+                ctx.trainer_dict[trainer]['status'] = {'maybe':0, 'coming':0, 'here':0, 'lobby':count}
                 ctx_startinglist.append(user.mention)
                 name_startinglist.append('**'+user.display_name+'**')
                 id_startinglist.append(trainer)
@@ -7169,7 +7064,7 @@ async def starting(ctx, team: str = ''):
         starting_str = _("Meowth! How can you start when there's no one waiting at this raid!?")
         await ctx.channel.send(starting_str)
         return
-    if team in team_names:
+    if team in ctx.team_names:
         question = await ctx.channel.send(_("Are you sure you would like to start this raid? Trainers {trainer_list}, react to this message to confirm or cancel the start of the raid.").format(trainer_list=', '.join(ctx_startinglist)))
     else:
         question = await ctx.channel.send(_("Are you sure you would like to start this raid? You can also use **!starting [team]** to start that team only. Trainers {trainer_list}, react to this message to confirm or cancel the start of the raid.").format(trainer_list=', '.join(ctx_startinglist)))
@@ -7183,24 +7078,26 @@ async def starting(ctx, team: str = ''):
     if timeout or res.emoji == '❎':
         await question.delete()
         return
+
+
     elif res.emoji == '✅':
         await question.delete()
-        guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['trainer_dict'] = trainer_dict
+        guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['trainer_dict'] = ctx.trainer_dict
         starttime = guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id].get('starttime',None)
         if starttime:
             timestr = _(' to start at **{}** ').format(starttime.strftime(_('%I:%M %p (%H:%M)')))
             guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['starttime'] = None
         else:
             timestr = ' '
-        starting_str = _('Starting - Meowth! The group that was waiting{timestr}is starting the raid! Trainers {trainer_list}, if you are not in this group and are waiting for the next group, please respond with {here_emoji} or **!here**. If you need to ask those that just started to back out of their lobby, use **!backout**').format(timestr=timestr, trainer_list=', '.join(ctx_startinglist), here_emoji=parse_emoji(ctx.guild, config['here_id']))
-        guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['lobby'] = {"exp":time.time() + 120, "team":team}
+            starting_str = _('Starting - Meowth! The group that was waiting{timestr}is starting the raid! Trainers {trainer_list}, if you are not in this group and are waiting for the next group, please respond with {here_emoji} or **!here**. If you need to ask those that just started to back out of their lobby, use **!backout**').format(timestr=timestr, trainer_list=', '.join(ctx_startinglist), here_emoji=parse_emoji(ctx.guild, config['here_id']))
+            guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['lobby'] = {"exp":time.time() + 120, "team":team}
         if starttime:
             starting_str += '\n\nThe start time has also been cleared, new groups can set a new start time wtih **!starttime HH:MM AM/PM** (You can also omit AM/PM and use 24-hour time!).'
             report_channel = Meowth.get_channel(guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['reportcity'])
             raidmsg = await ctx.channel.get_message(guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['raidmessage'])
             reportmsg = await report_channel.get_message(guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['raidreport'])
             embed = raidmsg.embeds[0]
-            embed.set_field_at(2, name=_("**Next Group**"), value="Set with **!starttime**", inline=True)
+            embed.set_field_at(2, name=_("**Next Group**"), value=_("Set with **!starttime**"), inline=True)
             try:
                 await raidmsg.edit(content=raidmsg.content,embed=embed)
             except discord.errors.NotFound:
@@ -7210,32 +7107,7 @@ async def starting(ctx, team: str = ''):
             except discord.errors.NotFound:
                 pass
         await ctx.channel.send(starting_str)
-        await asyncio.sleep(120)
-        if ('lobby' not in guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]) or (time.time() < guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['lobby']['exp']):
-            return
-        ctx_lobbycount = 0
-        trainer_delete_list = []
-        for trainer in trainer_dict:
-            if trainer_dict[trainer]['status']['lobby']:
-                ctx_lobbycount += trainer_dict[trainer]['status']['lobby']
-                trainer_delete_list.append(trainer)
-        if ctx_lobbycount > 0:
-            await ctx.channel.send(_('Meowth! The group of {count} in the lobby has entered the raid! Wish them luck!').format(count=str(ctx_lobbycount)))
-        for trainer in trainer_delete_list:
-            if team in team_names:
-                trainer_dict[trainer]['status'] = {'maybe':0, 'coming':0, 'here':herecount - teamcount, 'lobby': lobbycount}
-                trainer_dict[trainer]['party'][team] = 0
-                trainer_dict[trainer]['count'] = trainer_dict[trainer]['count'] - teamcount
-            else:
-                del trainer_dict[trainer]
-        try:
-            del guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['lobby']
-        except KeyError:
-            pass
-        await _edit_party(ctx.channel, ctx.author)
-        guild_dict[ctx.guild.id]['raidchannel_dict'][ctx.channel.id]['trainer_dict'] = trainer_dict
-    else:
-        return
+    ctx.bot.loop.create_task(lobby_countdown(ctx))
 
 @Meowth.command()
 @checks.activeraidchannel()
@@ -7306,8 +7178,8 @@ async def backout(ctx):
 List Commands
 """
 
-@Meowth.group(aliases=['lists'], case_insensitive=True)
-async def list(ctx):
+@Meowth.group(name="list", aliases=['lists'], case_insensitive=True)
+async def _list(ctx):
     """Lists all raid info for the current channel.
 
     Usage: !list
@@ -7468,7 +7340,7 @@ def list_output(r):
                 listmsg += ('\n' + bulletpoint) + (await _interest(ctx, tag, team))
             if " 0 on the way!" not in await _otw(ctx, tag, team):
                 listmsg += ('\n' + bulletpoint) + (await _otw(ctx, tag, team))
-            if " 0 waiting" not in await _waiting(ctx, tag, team):
+            if " 0 waiting at the raid!" not in await _waiting(ctx, tag, team):
                 listmsg += ('\n' + bulletpoint) + (await _waiting(ctx, tag, team))
             if " 0 in the lobby!" not in await _lobbylist(ctx, tag, team):
                 listmsg += ('\n' + bulletpoint) + (await _lobbylist(ctx, tag, team))
@@ -7482,7 +7354,7 @@ def list_output(r):
         else:
             raise checks.errors.CityRaidChannelCheckFail()
 
-@list.command()
+@_list.command()
 @checks.activechannel()
 async def interested(ctx, tags: str = ''):
     """Lists the number and users who are interested in the raid.
@@ -7529,7 +7401,7 @@ async def _interest(ctx, tag=False, team=False):
     listmsg = _(' {trainer_count} interested{including_string}!').format(trainer_count=str(ctx_maybecount), including_string=maybe_exstr)
     return listmsg
 
-@list.command()
+@_list.command()
 @checks.activechannel()
 async def coming(ctx, tags: str = ''):
     """Lists the number and users who are coming to a raid.
@@ -7576,7 +7448,7 @@ async def _otw(ctx, tag=False, team=False):
     listmsg = _(' {trainer_count} on the way{including_string}!').format(trainer_count=str(ctx_comingcount), including_string=otw_exstr)
     return listmsg
 
-@list.command()
+@_list.command()
 @checks.activechannel()
 async def here(ctx, tags: str = ''):
     """List the number and users who are present at a raid.
@@ -7626,7 +7498,7 @@ async def _waiting(ctx, tag=False, team=False):
     listmsg = _(' {trainer_count} waiting at the {raidtype}{including_string}!').format(trainer_count=str(ctx_herecount), raidtype=raidtype, including_string=here_exstr)
     return listmsg
 
-@list.command()
+@_list.command()
 @checks.activeraidchannel()
 async def lobby(ctx, tag=False):
     """List the number and users who are in the raid lobby.
@@ -7673,7 +7545,7 @@ async def _lobbylist(ctx, tag=False, team=False):
     listmsg = _(' {trainer_count} in the lobby{including_string}!').format(trainer_count=str(ctx_lobbycount), including_string=lobby_exstr)
     return listmsg
 
-@list.command()
+@_list.command()
 @checks.activeraidchannel()
 async def bosses(ctx):
     """List each possible boss and the number of users that have RSVP'd for it.
@@ -7720,7 +7592,7 @@ async def _bosslist(ctx):
         listmsg = _(' Nobody has told me what boss they want!')
     return listmsg
 
-@list.command()
+@_list.command()
 @checks.activechannel()
 async def teams(ctx):
     """List the teams for the users that have RSVP'd to a raid.
@@ -7764,7 +7636,7 @@ async def _teamlist(ctx):
         listmsg = _(' Nobody has updated their status!')
     return listmsg
 
-@list.command()
+@_list.command()
 @checks.allowwant()
 async def wants(ctx):
     """List the wants for the user
@@ -7786,7 +7658,49 @@ async def _wantlist(ctx):
         listmsg = _(" You don\'t have any wants! use **!want** to add some.")
     return listmsg
 
-@list.command()
+@_list.command()
+@checks.allowtrade()
+async def trades(ctx, user: discord.Member=None):
+    """List the trades for the user
+
+    Usage: !list trades [user]
+    Works only in trading channels."""
+    listmsg = _('**Meowth!**')
+    codemsg = ""
+    if (not user):
+        user = ctx.author
+    if user.id in guild_dict[ctx.guild.id].get('trainers',{}):
+        trainercode = guild_dict[ctx.guild.id]['trainers'][user.id].get('trainercode', None)
+        if trainercode:
+            codemsg += _("{user}\'s trainer code is: **{code}**").format(user=user.display_name, code=trainercode)
+    listmsg += await _tradelist(ctx, user)
+    await ctx.channel.send(codemsg, embed=discord.Embed(colour=ctx.guild.me.colour, description=listmsg))
+
+async def _tradelist(ctx, user):
+    tgt_trainer_trades = {}
+    listmsg = ""
+    for channel_id in guild_dict[ctx.guild.id]['trade_dict']:
+        for offer_id in guild_dict[ctx.guild.id]['trade_dict'][channel_id]:
+            if guild_dict[ctx.guild.id]['trade_dict'][channel_id][offer_id]['lister_id'] == user.id:
+                tgt_trainer_trades[offer_id] = guild_dict[ctx.guild.id]['trade_dict'][channel_id][offer_id]
+    if tgt_trainer_trades:
+        listmsg += _(" Here are the current trades for {user}").format(user=user.display_name)
+        for offer_id in tgt_trainer_trades:
+            offer_url = ""
+            try:
+                offer_channel = Meowth.get_channel(
+                    tgt_trainer_trades[offer_id]['report_channel_id'])
+                offer_message = await offer_channel.get_message(offer_id)
+                offer_url = offer_message.jump_url
+            except:
+                continue
+            listmsg += ('\n🔹')
+            listmsg += (f"**Offered Pokemon**: {tgt_trainer_trades[offer_id]['offered_pokemon']} | **Wanted Pokemon**: {', '.join(tgt_trainer_trades[offer_id]['wanted_pokemon'])} | [Go To Message]({offer_url})")
+    else:
+        listmsg += _(" {user} doesn't have any pokemon up for trade. Report one with **!trade**").format(user=user.display_name)
+    return listmsg
+
+@_list.command()
 @checks.allowresearchreport()
 async def research(ctx):
     """List the quests for the channel
@@ -7807,13 +7721,13 @@ async def _researchlist(ctx):
                 if questauthor:
                     if len(questmsg) < 1500:
                         questmsg += ('\n🔹')
-                        questmsg += _("**Reward**: {reward}, **Pokestop**: [{location}]({url}), **Quest**: {quest}, **Reported By**: {author}".format(location=research_dict[questid]['location'].title(),quest=research_dict[questid]['quest'].title(),reward=research_dict[questid]['reward'].title(), author=questauthor.display_name, url=research_dict[questid].get('url',None)))
+                        questmsg += _("**Reward**: {reward}, **Pokestop**: [{location}]({url}), **Quest**: {quest}, **Reported By**: {author}").format(location=research_dict[questid]['location'].title(),quest=research_dict[questid]['quest'].title(),reward=research_dict[questid]['reward'].title(), author=questauthor.display_name, url=research_dict[questid].get('url',None))
                     else:
                         listmsg = _('Meowth! **Here\'s the current research reports for {channel}**\n{questmsg}').format(channel=ctx.message.channel.name.capitalize(),questmsg=questmsg)
                         await ctx.channel.send(embed=discord.Embed(colour=ctx.guild.me.colour, description=listmsg))
                         questmsg = ""
                         questmsg += ('\n🔹')
-                        questmsg += _("**Reward**: {reward}, **Pokestop**: [{location}]({url}), **Quest**: {quest}, **Reported By**: {author}".format(location=research_dict[questid]['location'].title(),quest=research_dict[questid]['quest'].title(),reward=research_dict[questid]['reward'].title(), author=questauthor.display_name, url=research_dict[questid].get('url',None)))
+                        questmsg += _("**Reward**: {reward}, **Pokestop**: [{location}]({url}), **Quest**: {quest}, **Reported By**: {author}").format(location=research_dict[questid]['location'].title(),quest=research_dict[questid]['quest'].title(),reward=research_dict[questid]['reward'].title(), author=questauthor.display_name, url=research_dict[questid].get('url',None))
             except discord.errors.NotFound:
                 continue
     if questmsg:
@@ -7822,7 +7736,7 @@ async def _researchlist(ctx):
         listmsg = _(" There are no reported research reports. Report one with **!research**")
     return listmsg
 
-@list.command()
+@_list.command()
 @checks.allowwildreport()
 async def wilds(ctx):
     """List the wilds for the channel
@@ -7843,13 +7757,13 @@ async def _wildlist(ctx):
                 if wildauthor:
                     if len(wildmsg) < 1500:
                         wildmsg += ('\n🔹')
-                        wildmsg += _("**Pokemon**: {pokemon}, **Location**: [{location}]({url}), **Reported By**: {author}".format(pokemon=wild_dict[wildid]['pokemon'].title(),location=wild_dict[wildid]['location'].title(),author=wildauthor.display_name,url=wild_dict[wildid].get('url',None)))
+                        wildmsg += _("**Pokemon**: {pokemon}, **Location**: [{location}]({url}), **Reported By**: {author}").format(pokemon=wild_dict[wildid]['pokemon'].title(),location=wild_dict[wildid]['location'].title(),author=wildauthor.display_name,url=wild_dict[wildid].get('url',None))
                     else:
                         listmsg = _('Meowth! **Here\'s the current wild reports for {channel}**\n{wildmsg}').format(channel=ctx.message.channel.name.capitalize(),wildmsg=wildmsg)
                         await ctx.channel.send(embed=discord.Embed(colour=ctx.guild.me.colour, description=listmsg))
                         wildmsg = ""
                         wildmsg += ('\n🔹')
-                        wildmsg += _("**Pokemon**: {pokemon}, **Location**: [{location}]({url}), **Reported By**: {author}\n**Location**: <{url}>".format(pokemon=wild_dict[wildid]['pokemon'].title(),location=wild_dict[wildid]['location'].title(),author=wildauthor.display_name,url=wild_dict[wildid].get('url',None)))
+                        wildmsg += _("**Pokemon**: {pokemon}, **Location**: [{location}]({url}), **Reported By**: {author}\n**Location**: <{url}>").format(pokemon=wild_dict[wildid]['pokemon'].title(),location=wild_dict[wildid]['location'].title(),author=wildauthor.display_name,url=wild_dict[wildid].get('url',None))
             except discord.errors.NotFound:
                 continue
     if wildmsg:
diff --git a/meowth/__pycache__/__init__.cpython-36.pyc b/meowth/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 000000000..08677e369
Binary files /dev/null and b/meowth/__pycache__/__init__.cpython-36.pyc differ
diff --git a/meowth/__pycache__/__main__.cpython-36.pyc b/meowth/__pycache__/__main__.cpython-36.pyc
index 7ac29a9da..7d005c4fa 100644
Binary files a/meowth/__pycache__/__main__.cpython-36.pyc and b/meowth/__pycache__/__main__.cpython-36.pyc differ
diff --git a/meowth/__pycache__/bot.cpython-36.pyc b/meowth/__pycache__/bot.cpython-36.pyc
new file mode 100644
index 000000000..7cc41ed49
Binary files /dev/null and b/meowth/__pycache__/bot.cpython-36.pyc differ
diff --git a/meowth/__pycache__/checks.cpython-36.pyc b/meowth/__pycache__/checks.cpython-36.pyc
index 05dae9dd7..34af6e035 100644
Binary files a/meowth/__pycache__/checks.cpython-36.pyc and b/meowth/__pycache__/checks.cpython-36.pyc differ
diff --git a/meowth/__pycache__/context.cpython-36.pyc b/meowth/__pycache__/context.cpython-36.pyc
new file mode 100644
index 000000000..facffcbfa
Binary files /dev/null and b/meowth/__pycache__/context.cpython-36.pyc differ
diff --git a/meowth/__pycache__/errors.cpython-36.pyc b/meowth/__pycache__/errors.cpython-36.pyc
index a591e50c4..f98605f9d 100644
Binary files a/meowth/__pycache__/errors.cpython-36.pyc and b/meowth/__pycache__/errors.cpython-36.pyc differ
diff --git a/meowth/__pycache__/logs.cpython-36.pyc b/meowth/__pycache__/logs.cpython-36.pyc
index 88dc6d77c..834d15471 100644
Binary files a/meowth/__pycache__/logs.cpython-36.pyc and b/meowth/__pycache__/logs.cpython-36.pyc differ
diff --git a/meowth/__pycache__/pkmn_match.cpython-36.pyc b/meowth/__pycache__/pkmn_match.cpython-36.pyc
index 36fe6cf1e..7c6fcb1fa 100644
Binary files a/meowth/__pycache__/pkmn_match.cpython-36.pyc and b/meowth/__pycache__/pkmn_match.cpython-36.pyc differ
diff --git a/meowth/__pycache__/settings.cpython-36.pyc b/meowth/__pycache__/settings.cpython-36.pyc
new file mode 100644
index 000000000..5560e0191
Binary files /dev/null and b/meowth/__pycache__/settings.cpython-36.pyc differ
diff --git a/meowth/__pycache__/utils.cpython-36.pyc b/meowth/__pycache__/utils.cpython-36.pyc
new file mode 100644
index 000000000..925935b12
Binary files /dev/null and b/meowth/__pycache__/utils.cpython-36.pyc differ
diff --git a/meowth/bot.py b/meowth/bot.py
new file mode 100644
index 000000000..36b9ceec2
--- /dev/null
+++ b/meowth/bot.py
@@ -0,0 +1,18 @@
+from discord.ext import commands
+from meowth.context import Context
+
+class MeowthBot(commands.AutoShardedBot):
+    """Custom Discord Bot class for Meowth"""
+
+    async def process_commands(self, message):
+        """Processes commands that are registed with the bot and it's groups.
+
+        Without this being run in the main `on_message` event, commands will
+        not be processed.
+        """
+        if message.author.bot:
+            return
+        ctx = await self.get_context(message, cls=Context)
+        if not ctx.command:
+            return
+        await self.invoke(ctx)
diff --git a/meowth/checks.py b/meowth/checks.py
index 9a4c0da47..823ac8732 100644
--- a/meowth/checks.py
+++ b/meowth/checks.py
@@ -1,7 +1,7 @@
 
 from discord.ext import commands
 import discord.utils
-import errors
+from meowth import errors
 
 def is_owner_check(ctx):
     author = ctx.author.id
@@ -13,7 +13,7 @@ def is_owner():
 
 def is_dev_check(ctx):
     author = ctx.author.id
-    dev_list = [288810647960158220, 330338480498671616, 335826199148494850, 343059254690971659]
+    dev_list = [132314336914833409, 174764205927432192, 263607303096369152]
     return author in dev_list
 
 def is_dev_or_owner():
@@ -25,7 +25,7 @@ def predicate(ctx):
     return commands.check(predicate)
 
 def check_permissions(ctx, perms):
-    if (not perms):
+    if not perms:
         return False
     ch = ctx.channel
     author = ctx.author
@@ -150,6 +150,8 @@ def check_meetupset(ctx):
     if ctx.guild is None:
         return False
     guild = ctx.guild
+    if not ctx.bot.guild_dict[guild.id]['configure_dict'].get('meetup'):
+        return False
     return ctx.bot.guild_dict[guild.id]['configure_dict']['meetup'].get('enabled',False)
 
 def check_meetupreport(ctx):
@@ -157,6 +159,8 @@ def check_meetupreport(ctx):
         return False
     channel = ctx.channel
     guild = ctx.guild
+    if not ctx.bot.guild_dict[guild.id]['configure_dict'].get('meetup'):
+        return False
     channel_list = [x for x in ctx.bot.guild_dict[guild.id]['configure_dict']['meetup'].get('report_channels',{}).keys()]
     return channel.id in channel_list
 
@@ -168,6 +172,20 @@ def check_meetupchannel(ctx):
     meetup =  ctx.bot.guild_dict[guild.id].get('raidchannel_dict',{}).get(channel.id,{}).get('meetup',False)
     return meetup
 
+def check_tradeset(ctx):
+    if ctx.guild is None:
+        return False
+    guild = ctx.guild
+    return ctx.bot.guild_dict[guild.id]['configure_dict'].setdefault('trade', {}).get('enabled', False)
+
+def check_tradereport(ctx):
+    if ctx.guild is None:
+        return False
+    channel = ctx.channel
+    guild = ctx.guild
+    channel_list = [x for x in ctx.bot.guild_dict[guild.id]['configure_dict'].setdefault('trade', {}).get('report_channels',[])]
+    return channel.id in channel_list
+
 def check_wildset(ctx):
     if ctx.guild is None:
         return False
@@ -316,6 +334,17 @@ def predicate(ctx):
         raise errors.WantSetCheckFail()
     return commands.check(predicate)
 
+def allowtrade():
+    def predicate(ctx):
+        if check_tradeset(ctx):
+            if check_tradereport(ctx):
+                return True
+            else:
+                raise errors.TradeChannelCheckFail()
+        else:
+            raise errors.TradeSetCheckFail()
+    return commands.check(predicate)
+
 def allowarchive():
     def predicate(ctx):
         if check_archiveset(ctx):
@@ -367,3 +396,14 @@ def predicate(ctx):
                 return True
         raise errors.ActiveChannelCheckFail()
     return commands.check(predicate)
+
+def feature_enabled(names, ensure_all=False):
+    def predicate(ctx):
+        cfg = ctx.bot.guild_dict[ctx.guild.id]['configure_dict']
+        enabled = [k for k, v in cfg.items() if v.get('enabled', False)]
+        if isinstance(names, list):
+            result = [n in enabled for n in names]
+            return all(*result) if ensure_all else any(*result)
+        if isinstance(names, str):
+            return names in enabled
+    return commands.check(predicate)
diff --git a/meowth/context.py b/meowth/context.py
new file mode 100644
index 000000000..2998aa1d4
--- /dev/null
+++ b/meowth/context.py
@@ -0,0 +1,365 @@
+import textwrap
+
+import discord
+from discord.ext import commands
+
+from meowth.utils import convert_to_bool, make_embed, bold
+from meowth import settings
+
+class Context(commands.Context):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.get = GetTools(self)
+        if self.guild:
+            guild_data = self.bot.guild_dict[self.guild.id]
+            self.data = settings.GuildData(self, guild_data)
+
+    async def codeblock(self, contents, syntax="py", send=True, title=None):
+        paginator = commands.Paginator(prefix=f'```{syntax}', max_size=1900)
+        for line in contents.split('\n'):
+            for wrapline in textwrap.wrap(line, width=80):
+                paginator.add_line(wrapline.rstrip().replace('`', '\u200b`'))
+        if not send:
+            return paginator.pages
+        for page in paginator.pages:
+            if page == paginator.pages[0] and title:
+                page = bold(title)+"\n"+page
+            await self.send(page)
+
+    async def ok(self):
+        await self.message.add_reaction('\u2705')
+
+    async def no(self):
+        await self.message.add_reaction('\u274e')
+
+    async def error(self, title, details=None):
+        """Quick send or build an error embed response"""
+        return await self.embed(
+            title=title, description=details, msg_type='error')
+
+    async def success(self, title=None, details=None, send=True):
+        """Quick send or build an info embed response."""
+        if title:
+            return await self.embed(title, details, msg_type='success', send=send)
+        else:
+            await self.ok()
+
+    async def info(self, title, details=None, send=True):
+        """Quick send or build an info embed response."""
+        return await self.embed(title, details, msg_type='info', send=send)
+
+    async def warning(self, title, details=None, send=True):
+        """Quick send or build an info embed response."""
+        return await self.embed(title, details, msg_type='warning', send=send)
+
+    async def embed(self, title, description=None, plain_msg='', *,
+                    msg_type=None, title_url=None, colour=None,
+                    icon=None, thumbnail='', image='', fields: dict = None,
+                    footer=None, footer_icon=None, send=True, inline=False):
+        """Send or build an embed using context details."""
+        embed = make_embed(title=title, content=description, msg_type=msg_type,
+                           title_url=title_url, msg_colour=colour, icon=icon,
+                           thumbnail=thumbnail, image=image, guild=self.guild)
+        if fields:
+            for key, value in fields.items():
+                ilf = inline
+                if not isinstance(value, str):
+                    ilf = value[0]
+                    value = value[1]
+                embed.add_field(name=key, value=value, inline=ilf)
+        if footer:
+            footer = {'text':footer}
+            if footer_icon:
+                footer['icon_url'] = footer_icon
+            embed.set_footer(**footer)
+
+        if not send:
+            return embed
+
+        return await self.send(plain_msg, embed=embed)
+
+class GetTools:
+    """Tools to easily get discord objects via Context."""
+
+    def __init__(self, ctx):
+        self.ctx = ctx
+        self.get = discord.utils.get
+
+    async def user(self, search_term):
+        """Get a user by ID or name.
+
+        If an ID is provided, it will return a user even if they don't share a
+        guild with the bot.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The user ID, name or name with discriminator
+
+        Returns
+        --------
+        :class:`discord.User` or :obj:`None`
+            Returns the `User` or `None` if not found.
+        """
+        bot = self.ctx.bot
+        if isinstance(search_term, int):
+            user = bot.get_user(search_term)
+            if user:
+                return user
+            try:
+                user = await bot.get_user_info(search_term)
+            except discord.NotFound:
+                return None
+            else:
+                return user
+        if isinstance(search_term, str):
+            member = self.get(bot.users, name=search_term)
+            if not member:
+                members = {str(m) : m for m in bot.users}
+                member = members.get(search_term, None)
+            return member
+
+    async def message(self, id, channel=None, guild=None):
+        """Get a message from the current or specified channels.
+
+        Parameters
+        -----------
+        id: :class:`int`
+            The message ID
+        channel: :class:`discord.TextChannel`, :obj:str or :obj:int, optional
+            Specify channel other than the current one. Accepts a discord
+            `TextChannel`, channel ID as `int`, or channel name as `str`.
+
+        Returns
+        --------
+        :class:`discord.Message` or :obj:`None`
+            Returns the Message or None if not found.
+        """
+        if isinstance(channel, (int, str)):
+            if isinstance(guild, (int, str)):
+                guild = self.guild(guild)
+                if not guild:
+                    return None
+            channel = self.channel(channel, guild=guild)
+            if not guild:
+                return None
+        channel = channel or self.ctx.channel
+        try:
+            return await channel.get_message(id)
+        except discord.NotFound:
+            return None
+
+    def channel(self, search_term, guild=None):
+        """Get a channel from the current or specified guild.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The channel ID or channel name
+        guild: :class:`discord.Guild`, :obj:`int` or :obj:`str`, optional
+            Specify guild other than the current one. Accepts a discord
+            `Guild`, channel ID as `int`, or channel name as `str`.
+
+        Returns
+        --------
+        :class:`discord.abc.GuildChannel` or :obj:`None`
+            Returns the `Channel` or `None` if not found.
+        """
+        if isinstance(guild, (int, str)):
+            guild = self.guild(guild)
+            if not guild:
+                return None
+        guild = guild or self.ctx.guild
+        if not guild:
+            return None
+        if isinstance(search_term, int):
+            return guild.get_channel(search_term)
+        if isinstance(search_term, str):
+            return self.get(guild.channels, name=search_term)
+
+    def text_channel(self, search_term, guild=None):
+        """Get a text channel from the current or specified guild.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The channel ID or channel name
+        guild: :class:`discord.Guild`, :obj:`int` or :obj:`str`, optional
+            Specify guild other than the current one. Accepts a discord
+            `Guild`, channel ID as `int`, or channel name as `str`.
+
+        Returns
+        --------
+        :class:`discord.TextChannel` or :obj:`None`
+            Returns the `TextChannel` or `None` if not found.
+        """
+        if isinstance(guild, (int, str)):
+            guild = self.guild(guild)
+            if not guild:
+                return None
+        guild = guild or self.ctx.guild
+        if not guild:
+            return None
+        if isinstance(search_term, int):
+            channel = guild.get_channel(search_term)
+            if isinstance(channel, discord.TextChannel):
+                return channel
+            return None
+        if isinstance(search_term, str):
+            return self.get(guild.text_channels, name=search_term)
+
+    def voice_channel(self, search_term, guild=None):
+        """Get a voice channel from the current or specified guild.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The channel ID or channel name
+        guild: :class:`discord.Guild`, :obj:`int` or :obj:`str`, optional
+            Specify guild other than the current one. Accepts a discord
+            `Guild`, channel ID as `int`, or channel name as `str`.
+
+        Returns
+        --------
+        :class:`discord.VoiceChannel` or :obj:`None`
+            Returns the `VoiceChannel` or `None` if not found.
+        """
+        if isinstance(guild, (int, str)):
+            guild = self.guild(guild)
+            if not guild:
+                return None
+        guild = guild or self.ctx.guild
+        if not guild:
+            return None
+        if isinstance(search_term, int):
+            return self.get(guild.voice_channels, id=search_term)
+        if isinstance(search_term, str):
+            return self.get(guild.voice_channels, name=search_term)
+
+    def category(self, search_term, guild=None):
+        """Get a channel category from the current or specified guild.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The category ID or category name
+        guild: :class:`discord.Guild`, :obj:`int` or :obj:`str`, optional
+            Specify guild other than the current one. Accepts a discord
+            `Guild`, channel ID as `int`, or channel name as `str`.
+
+        Returns
+        --------
+        :class:`discord.CategoryChannel` or :obj:`None`
+            Returns the `CategoryChannel` or `None` if not found.
+        """
+        if isinstance(guild, (int, str)):
+            guild = self.guild(guild)
+            if not guild:
+                return None
+        guild = guild or self.ctx.guild
+        if not guild:
+            return None
+        if isinstance(search_term, int):
+            return self.get(guild.categories, id=search_term)
+        if isinstance(search_term, str):
+            return self.get(guild.categories, name=search_term)
+
+    def member(self, search_term, guild=None):
+        """Get a member from the current or specified guild.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The member ID, name, nickname or full name with discriminator
+        guild: :class:`discord.Guild`, :obj:`int` or :obj:`str`, optional
+            Specify guild other than the current one. Accepts a discord
+            `Guild`, channel ID as `int`, or channel name as `str`.
+
+        Returns
+        --------
+        :class:`discord.Member` or :obj:`None`
+            Returns the `Member` or `None` if not found.
+        """
+        if isinstance(guild, (int, str)):
+            guild = self.guild(guild)
+            if not guild:
+                return None
+        guild = guild or self.ctx.guild
+        if not guild:
+            return None
+        if isinstance(search_term, int):
+            return guild.get_member(search_term)
+        if isinstance(search_term, str):
+            member = self.get(guild.members, name=search_term)
+            if not member:
+                member = self.get(guild.members, nick=search_term)
+            if not member:
+                members = {str(m) : m for m in guild.members}
+                member = members.get(search_term, None)
+            return member
+
+    def role(self, search_term, guild=None):
+        """Get a role from the current or specified guild.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The role ID or name
+        guild: :class:`discord.Guild`, :obj:`int` or :obj:`str`, optional
+            Specify guild other than the current one. Accepts a discord
+            `Guild`, channel ID as `int`, or channel name as `str`.
+
+        Returns
+        --------
+        :class:`discord.Role` or :obj:`None`
+            Returns the `Role` or `None` if not found.
+        """
+        if isinstance(guild, (int, str)):
+            guild = self.guild(guild)
+            if not guild:
+                return None
+        guild = guild or self.ctx.guild
+        if not guild:
+            return None
+        if isinstance(search_term, int):
+            return self.get(guild.roles, id=search_term)
+        if isinstance(search_term, str):
+            return self.get(guild.roles, name=search_term)
+
+    def guild(self, search_term):
+        """Get a guild by ID or fuzzymatched name.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The guild ID or name
+
+        Returns
+        --------
+        :class:`discord.Guild` or :obj:`None`
+            Returns the `Guild` or `None` if not found.
+        """
+        bot = self.ctx.bot
+        if isinstance(search_term, int):
+            return bot.get_guild(search_term)
+        if isinstance(search_term, str):
+            return bot.find_guild(name=search_term)
+
+    def emoji(self, search_term):
+        """Get an emoji by ID or name.
+
+        Parameters
+        -----------
+        search_term: :class:`id` or :class:`str`
+            The emoji ID or name
+
+        Returns
+        --------
+        :class:`discord.Emoji` or :obj:`None`
+            Returns the `Emoji` or `None` if not found.
+        """
+        bot = self.ctx.bot
+        if isinstance(search_term, int):
+            return bot.get_emoji(search_term)
+        if isinstance(search_term, str):
+            return self.get(bot.emojis, name=search_term)
diff --git a/meowth/errors.py b/meowth/errors.py
index 5aac9e6a7..ac7929fd4 100644
--- a/meowth/errors.py
+++ b/meowth/errors.py
@@ -101,6 +101,14 @@ class WildReportChannelCheckFail(CommandError):
     'Exception raised checks.researchreport fails'
     pass
 
+class TradeChannelCheckFail(CommandError):
+    'Exception raised checks.tradereport fails'
+    pass
+
+class TradeSetCheckFail(CommandError):
+    'Exception raised checks.tradeset fails'
+    pass
+
 async def delete_error(message, error):
     try:
         await message.delete()
@@ -113,7 +121,7 @@ async def delete_error(message, error):
 
 def missing_arg_msg(ctx):
     prefix = ctx.prefix.replace(ctx.bot.user.mention, '@' + ctx.bot.user.name)
-    command = ctx.invoked_with
+    command = ctx.invoked_subcommand or ctx.invoked_with
     callback = ctx.command.callback
     sig = list(signature(callback).parameters.keys())
     (args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations) = getfullargspec(callback)
@@ -162,58 +170,58 @@ async def on_command_error(ctx, error):
         elif isinstance(error, commands.CheckFailure):
             pass
         elif isinstance(error, TeamSetCheckFail):
-            msg = _('Meowth! Team Management is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Team Management is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, WantSetCheckFail):
-            msg = _('Meowth! Pokemon Notifications are not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Pokemon Notifications are not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, WildSetCheckFail):
-            msg = _('Meowth! Wild Reporting is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Wild Reporting is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, ReportCheckFail):
-            msg = _('Meowth! Reporting is not enabled for this channel. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Reporting is not enabled for this channel. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, RaidSetCheckFail):
-            msg = _('Meowth! Raid Management is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Raid Management is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, EXRaidSetCheckFail):
-            msg = _('Meowth! EX Raid Management is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! EX Raid Management is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, ResearchSetCheckFail):
-            msg = _('Meowth! Research Reporting is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Research Reporting is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, MeetupSetCheckFail):
-            msg = _('Meowth! Meetup Reporting is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Meetup Reporting is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, ArchiveSetCheckFail):
-            msg = _('Meowth! Channel Archiving is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Channel Archiving is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, InviteSetCheckFail):
-            msg = _('Meowth! EX Raid Invite is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! EX Raid Invite is not enabled on this server. **{prefix}{cmd_name}** is unable to be used.').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, CityChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['raid']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
@@ -230,7 +238,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, WantChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in the following channel').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in the following channel').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             want_channels = bot.guild_dict[guild.id]['configure_dict']['want']['report_channels']
             if len(want_channels) > 1:
                 msg += _('s:\n')
@@ -251,7 +259,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, RaidChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in a Raid channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in a Raid channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['raid']['report_channels']
             if len(city_channels) > 10:
                 msg += _('Region report channel to see active raids.')
@@ -268,7 +276,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, EggChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in an Egg channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in an Egg channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['raid']['report_channels']
             if len(city_channels) > 10:
                 msg += _('Region report channel to see active raids.')
@@ -284,13 +292,13 @@ async def on_command_error(ctx, error):
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, NonRaidChannelCheckFail):
-            msg = _("Meowth! **{prefix}{cmd_name}** can't be used in a Raid channel.").format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _("Meowth! **{prefix}{cmd_name}** can't be used in a Raid channel.").format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
         elif isinstance(error, ActiveRaidChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in an Active Raid channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in an Active Raid channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['raid']['report_channels']
             try:
                 egg_check = bot.guild_dict[guild.id]['raidchannel_dict'][ctx.channel.id].get('type',None)
@@ -315,7 +323,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, ActiveChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in an Active channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in an Active channel. Use **{prefix}list** in any ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['raid']['report_channels']
             try:
                 egg_check = bot.guild_dict[guild.id]['raidchannel_dict'][ctx.channel.id].get('type',None)
@@ -340,7 +348,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, CityRaidChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in either a Raid channel or ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in either a Raid channel or ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['raid']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
@@ -357,7 +365,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, RegionEggChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in either a Raid Egg channel or ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in either a Raid Egg channel or ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['raid']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
@@ -374,7 +382,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, RegionExRaidChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in either a EX Raid channel or one of the following region channels:').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in either a EX Raid channel or one of the following region channels:').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['exraid']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
@@ -391,7 +399,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, ExRaidChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in a EX Raid channel. Use **{prefix}list** in any of the following region channels to see active raids:').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in a EX Raid channel. Use **{prefix}list** in any of the following region channels to see active raids:').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['exraid']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
@@ -408,7 +416,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, ResearchReportChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['research']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
@@ -425,7 +433,7 @@ async def on_command_error(ctx, error):
             await delete_error(ctx.message, error)
         elif isinstance(error, MeetupReportChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['meetup']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
@@ -440,9 +448,26 @@ async def on_command_error(ctx, error):
             error = await ctx.channel.send(msg)
             await asyncio.sleep(10)
             await delete_error(ctx.message, error)
+        elif isinstance(error, TradeChannelCheckFail):
+            guild = ctx.guild
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
+            city_channels = bot.guild_dict[guild.id]['configure_dict']['trade']['report_channels']
+            if len(city_channels) > 10:
+                msg += _('a Region report channel.')
+            else:
+                msg += _('one of the following region channels:')
+                for c in city_channels:
+                    channel = discord.utils.get(guild.channels, id=c)
+                    if channel:
+                        msg += '\n' + channel.mention
+                    else:
+                        msg += '\n#deleted-channel'
+            error = await ctx.channel.send(msg)
+            await asyncio.sleep(10)
+            await delete_error(ctx.message, error)
         elif isinstance(error,WildReportChannelCheckFail):
             guild = ctx.guild
-            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_with, prefix=prefix)
+            msg = _('Meowth! Please use **{prefix}{cmd_name}** in ').format(cmd_name=ctx.invoked_subcommand or ctx.invoked_with, prefix=prefix)
             city_channels = bot.guild_dict[guild.id]['configure_dict']['wild']['report_channels']
             if len(city_channels) > 10:
                 msg += _('a Region report channel.')
diff --git a/meowth/exts/__init__.py b/meowth/exts/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/meowth/exts/__pycache__/__init__.cpython-36.pyc b/meowth/exts/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 000000000..3ca661123
Binary files /dev/null and b/meowth/exts/__pycache__/__init__.cpython-36.pyc differ
diff --git a/meowth/exts/__pycache__/datahandler.cpython-36.pyc b/meowth/exts/__pycache__/datahandler.cpython-36.pyc
new file mode 100644
index 000000000..debfac3c7
Binary files /dev/null and b/meowth/exts/__pycache__/datahandler.cpython-36.pyc differ
diff --git a/meowth/exts/__pycache__/pokemon.cpython-36.pyc b/meowth/exts/__pycache__/pokemon.cpython-36.pyc
new file mode 100644
index 000000000..2d1ef7e19
Binary files /dev/null and b/meowth/exts/__pycache__/pokemon.cpython-36.pyc differ
diff --git a/meowth/exts/__pycache__/silph.cpython-36.pyc b/meowth/exts/__pycache__/silph.cpython-36.pyc
new file mode 100644
index 000000000..d0076f95e
Binary files /dev/null and b/meowth/exts/__pycache__/silph.cpython-36.pyc differ
diff --git a/meowth/exts/__pycache__/trade.cpython-36.pyc b/meowth/exts/__pycache__/trade.cpython-36.pyc
new file mode 100644
index 000000000..c9f44e903
Binary files /dev/null and b/meowth/exts/__pycache__/trade.cpython-36.pyc differ
diff --git a/meowth/exts/__pycache__/tutorial.cpython-36.pyc b/meowth/exts/__pycache__/tutorial.cpython-36.pyc
new file mode 100644
index 000000000..1afcc2102
Binary files /dev/null and b/meowth/exts/__pycache__/tutorial.cpython-36.pyc differ
diff --git a/meowth/exts/__pycache__/utilities.cpython-36.pyc b/meowth/exts/__pycache__/utilities.cpython-36.pyc
new file mode 100644
index 000000000..582d594fd
Binary files /dev/null and b/meowth/exts/__pycache__/utilities.cpython-36.pyc differ
diff --git a/meowth/exts/datahandler.py b/meowth/exts/datahandler.py
new file mode 100644
index 000000000..4ed1964a1
--- /dev/null
+++ b/meowth/exts/datahandler.py
@@ -0,0 +1,185 @@
+import json
+from functools import partial
+
+from discord.ext import commands
+from meowth import utils
+from meowth import checks
+
+class DataHandler:
+    """Data Loading and Saving Test Cog."""
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.raid_info = bot.raid_info
+        self.pkmn_info = bot.pkmn_info
+        self.pkmn_match = partial(utils.get_match, self.pkmn_info['pokemon_list'])
+
+    def __local_check(self, ctx):
+        return checks.is_owner_check(ctx) or checks.is_dev_check(ctx)
+
+    def get_name(self, pkmn_number):
+        pkmn_number = int(pkmn_number) - 1
+        try:
+            name = self.pkmn_info['pokemon_list'][pkmn_number]
+        except IndexError:
+            name = None
+        return name
+
+    def get_number(self, pkm_name):
+        try:
+            number = self.pkmn_info['pokemon_list'].index(pkm_name) + 1
+        except ValueError:
+            number = None
+        return int(number)
+
+    @commands.group(invoke_without_command=True)
+    async def raiddata(self, ctx, level=None):
+        """Show all raid Pokemon, showing only the raid level if provided."""
+        data = []
+        title = None
+        if level:
+            title = f"Pokemon Data for Raid {level}"
+            try:
+                for pkmnno in self.raid_info['raid_eggs'][level]["pokemon"]:
+                    data.append(f"#{pkmnno} - {self.get_name(pkmnno)}")
+            except KeyError:
+                return await ctx.send('Invalid raid level specified.')
+        else:
+            title = f"Pokemon Data for All Raids"
+            data = []
+            for pkmnlvl, vals in self.raid_info['raid_eggs'].items():
+                if not vals["pokemon"]:
+                    continue
+                leveldata = []
+                for pkmnno in vals["pokemon"]:
+                    leveldata.append(f"#{pkmnno} - {self.get_name(pkmnno)}")
+                leveldata = '\n'.join(leveldata)
+                data.append(f"**Raid {pkmnlvl} Pokemon**\n{leveldata}\n")
+        data_str = '\n'.join(data)
+        await ctx.send(f"**{title}**\n{data_str}")
+
+    def in_list(self, pokemon_no):
+        for pkmnlvl, vals in self.raid_info['raid_eggs'].items():
+            if int(pokemon_no) in vals["pokemon"]:
+                return pkmnlvl
+        return None
+
+    @raiddata.command(name='remove', aliases=['rm', 'del', 'delete'])
+    async def remove_rd(self, ctx, *raid_pokemon):
+        """Removes all pokemon provided as arguments from the raid data.
+
+        Note: If a multi-word pokemon name is used, wrap in quote marks:
+        Example: !raiddata remove "Mr Mime" Jynx
+        """
+        results = []
+        for pokemon in raid_pokemon:
+            if not pokemon.isdigit():
+                match = self.pkmn_match(pokemon)[0]
+                if not match:
+                    return await ctx.send('Invalid Pokemon Name')
+                pokemon = self.get_number(match)
+            hit_key = []
+            for k, v in self.raid_info['raid_eggs'].items():
+                if pokemon in v['pokemon']:
+                    hit_key.append(k)
+                    self.raid_info['raid_eggs'][k]['pokemon'].remove(pokemon)
+            hits = '\n'.join(hit_key)
+            results.append(f"#{pokemon} {self.get_name(pokemon)} from {hits}")
+        results_st = '\n'.join(results)
+        await ctx.send(f"**Pokemon removed from raid data**\n{results_st}")
+
+    def add_raid_pkmn(self, level, *raid_pokemon):
+        """Add raid pokemon to relevant level."""
+        added = []
+        failed = []
+        raid_list = self.raid_info['raid_eggs'][level]['pokemon']
+        for pokemon in raid_pokemon:
+            if not pokemon.isdigit():
+                match = self.pkmn_match(pokemon)[0]
+                if not match:
+                    failed.append(pokemon)
+                    continue
+                pokemon = self.get_number(match)
+            in_level = self.in_list(pokemon)
+            if in_level:
+                if in_level == level:
+                    continue
+                self.raid_info['raid_eggs'][in_level]['pokemon'].remove(pokemon)
+            raid_list.append(pokemon)
+            added.append(f"#{pokemon} {self.get_name(pokemon)}")
+        return (added, failed)
+
+    @raiddata.command(name='add')
+    async def add_rd(self, ctx, level, *raid_pokemon):
+        """Adds all pokemon provided as arguments to the specified raid
+        level in the raid data.
+
+        Note: If a multi-word pokemon name is used, wrap in quote marks:
+        Example: !raiddata add "Mr Mime" Jynx
+        """
+
+        if level not in self.raid_info['raid_eggs'].keys():
+            return await ctx.send("Invalid raid level specified.")
+
+        added, failed = self.add_raid_pkmn(level, *raid_pokemon)
+
+        result = []
+
+        if added:
+            result.append(
+                f"**{len(added)} Pokemon added to Level {level} Raids:**\n"
+                f"{', '.join(added)}")
+
+        if failed:
+            result.append(
+                f"**{len(failed)} entries failed to be added:**\n"
+                f"{', '.join(failed)}")
+
+        await ctx.send('\n'.join(result))
+
+    @raiddata.command(name='replace', aliases=['rp'])
+    async def replace_rd(self, ctx, level, *raid_pokemon):
+        """All pokemon provided will replace the specified raid level
+        in the raid data.
+
+        Note: If a multi-word pokemon name is used, wrap in quote marks:
+        Example: !raiddata add "Mr Mime" Jynx
+        """
+        if level not in self.raid_info['raid_eggs'].keys():
+            return await ctx.send("Invalid raid level specified.")
+        if not raid_pokemon:
+            return await ctx.send("No pokemon provided.")
+        old_data = tuple(self.raid_info['raid_eggs'][level]['pokemon'])
+        self.raid_info['raid_eggs'][level]['pokemon'] = []
+        added, failed = self.add_raid_pkmn(level, *raid_pokemon)
+        if not added:
+            self.raid_info['raid_eggs'][level]['pokemon'].extend(old_data)
+
+        result = []
+
+        if added:
+            result.append(
+                f"**{len(added)} Pokemon added to Level {level} Raids:**\n"
+                f"{', '.join(added)}")
+
+        if failed:
+            result.append(
+                f"**{len(failed)} entries failed to be added:**\n"
+                f"{', '.join(failed)}")
+
+        await ctx.send('\n'.join(result))
+
+    @raiddata.command(name='save', aliases=['commit'])
+    async def save_rd(self, ctx):
+        """Saves the current raid data state to the json file."""
+        for pkmn_lvl in self.raid_info['raid_eggs']:
+            data = self.raid_info['raid_eggs'][pkmn_lvl]["pokemon"]
+            pkmn_ints = [int(p) for p in data]
+            self.raid_info['raid_eggs'][pkmn_lvl]["pokemon"] = pkmn_ints
+
+        with open(ctx.bot.raid_json_path, 'w') as fd:
+            json.dump(self.raid_info, fd, indent=4)
+        await ctx.message.add_reaction('\u2705')
+
+def setup(bot):
+    bot.add_cog(DataHandler(bot))
diff --git a/meowth/exts/gymmatching.py b/meowth/exts/gymmatching.py
new file mode 100644
index 000000000..c19c3aea1
--- /dev/null
+++ b/meowth/exts/gymmatching.py
@@ -0,0 +1,42 @@
+import os
+import json
+
+from discord.ext import commands
+
+from meowth import utils
+
+class GymMatching:
+    def __init__(self, bot):
+        self.bot = bot
+        self.gym_data = self.init_json()
+
+    def init_json(self):
+        with open(os.path.join('data', 'gym_data.json')) as fd:
+            return json.load(fd)
+
+    def get_gyms(self, guild_id):
+        return self.gym_data.get(str(guild_id))
+
+    def gym_match(self, gym_name, gyms):
+        return utils.get_match(list(gyms.keys()), gym_name)
+
+    @commands.command(hidden=True)
+    async def gym_match_test(self, ctx, gym_name):
+        gyms = self.get_gyms(ctx.guild.id)
+        if not gyms:
+            await ctx.send('Gym matching has not been set up for this server.')
+            return
+        match, score = self.gym_match(gym_name, gyms)
+        if match:
+            gym_info = gyms[match]
+            coords = gym_info['coordinates']
+            notes = gym_info.get('notes', 'No notes for this gym.')
+            gym_info_str = (f"**Coordinates:** {coords}\n"
+                            f"**Notes:** {notes}")
+            await ctx.send(f"Successful match with `{match}` "
+                           f"with a score of `{score}`\n{gym_info_str}")
+        else:
+            await ctx.send("No match found.")
+
+def setup(bot):
+    bot.add_cog(GymMatching(bot))
diff --git a/meowth/exts/pokemon.py b/meowth/exts/pokemon.py
new file mode 100644
index 000000000..9dd7ac757
--- /dev/null
+++ b/meowth/exts/pokemon.py
@@ -0,0 +1,458 @@
+from string import ascii_lowercase
+
+import discord
+from discord.ext import commands
+from discord.ext.commands import CommandError
+
+from meowth import utils
+
+
+class PokemonNotFound(CommandError):
+    """Exception raised when Pokemon given does not exist."""
+    def __init__(self, pokemon, retry=True):
+        self.pokemon = pokemon
+        self.retry = retry
+
+class Pokedex:
+    def __init__(self, bot):
+        self.bot = bot
+
+class Pokemon():
+    """Represents a Pokemon.
+
+    This class contains the attributes of a specific pokemon, and
+    provides methods of which to get specific info and results on it.
+
+    Parameters
+    -----------
+    bot: :class:`eevee.core.bot.Eevee`
+        Current instance of Eevee
+    pkmn: str or int
+        The name or id of a Pokemon
+    guild: :class:`discord.Guild`, optional
+        The guild that is requesting the Pokemon
+    moveset: :class:`list` or :class:`tuple` of :class:`str`, optional
+        `kwarg-only:` The two moves of this Pokemon
+    weather: :class:`str`, optional
+        `kwarg-only:` Weather during the encounter
+
+    Raises
+    -------
+    :exc:`.errors.PokemonNotFound`
+        The pkmn argument was not a valid index and was not found in the
+        list of Pokemon names.
+
+    Attributes
+    -----------
+    name: :class:`str`
+        Lowercase string representing the name of the Pokemon
+    id: :class:`int`
+        Pokemon ID number
+    types: :class:`list` of :class:`str`
+        A :class:`list` of the Pokemon's types
+    moveset: :class:`list` or :class:`tuple` of :class:`str`
+        The two moves of this Pokemon
+    weather: :class:`str`
+        Weather during the encounter
+    guild: :class:`discord.Guild`
+        Guild that created the Pokemon
+    bot: :class:`eevee.core.bot.Eevee`
+        Current instance of Eevee
+    """
+
+    __slots__ = ('name', 'id', 'types', 'bot', 'guild', 'pkmn_list',
+                 'pb_raid', 'weather', 'moveset', 'form', 'shiny',
+                 'alolan', 'legendary', 'mythical')
+
+    def __init__(self, bot, pkmn, guild=None, **attribs):
+        self.bot = bot
+        self.guild = guild
+        self.pkmn_list = bot.pkmn_info['pokemon_list']
+
+        lgnd_list = [
+            144, 145, 146, 150, 243, 244, 245, 377, 378, 379, 380, 381,
+            382, 383, 384
+        ]
+
+        mythical_list = [151, 251]
+
+        shiny_list = [
+            1, 2, 3, 4, 5, 6, 7, 8, 9, 25, 26, 90, 91, 126, 129, 130,
+            133, 134, 135, 136, 138, 139, 140, 141, 142, 144, 145, 147, 
+            148, 149, 172, 175, 176, 177, 178, 179, 180, 181, 191, 192, 
+            196, 197, 198, 202, 204, 205, 209, 210, 228, 229, 240, 246, 
+            247, 248, 249, 250, 261, 262, 296, 297, 302, 303, 304, 305, 
+            306, 307, 308, 311, 312, 315, 320, 321, 333, 334, 353, 354, 
+            355, 356, 359, 360, 361, 362, 370, 382
+        ]
+
+        alolan_list = [19, 20, 26, 27, 28, 37, 38, 
+            50, 51, 52, 53, 74, 75, 76, 88, 89, 103, 105]
+
+        form_dict = {
+            7: ['sunglasses'],
+            8: ['sunglasses'],
+            9: ['sunglasses'],
+            25:  ['ash', 'party', 'witch', 'santa', 'summer'],
+            26:  ['ash', 'party', 'witch', 'santa', 'summer'],
+            172:  ['ash', 'party', 'witch', 'santa', 'summer'],
+            201: list(ascii_lowercase) + ['!', '?'],
+            327: ['1', '2', '3', '4', '5', '6', '7', '8'],
+            351: ['normal', 'rainy', 'snowy', 'sunny'],
+            386: ['defense', 'normal', 'attack', 'speed']
+        }
+
+        if pkmn.isdigit():
+            try:
+                pkmn = self.pkmn_list[int(pkmn)-1]
+            except IndexError:
+                pass
+
+        self.name = pkmn
+        if pkmn not in self.pkmn_list:
+            raise PokemonNotFound(pkmn)
+        self.id = self.pkmn_list.index(pkmn)+1
+        self.types = self._get_type()
+        self.pb_raid = None
+        self.weather = attribs.get('weather', None)
+        self.moveset = attribs.get('moveset', [])
+        self.form = attribs.get('form', '')
+        if self.form not in form_dict.get(self.id, []):
+            self.form = None
+        self.shiny = attribs.get('shiny', False)
+        if self.id not in shiny_list:
+            self.shiny = False
+        self.alolan = attribs.get('alolan', False)
+        if self.id not in alolan_list:
+            self.alolan = False
+        if self.id in lgnd_list:
+            self.legendary = True
+        elif self.id in mythical_list:
+            self.mythical = True
+        else:
+            self.legendary = False
+            self.mythical = False
+
+
+    def __str__(self):
+        name = self.name.title()
+        if self.form:
+            name = name + f" {self.form.title()}"
+        if self.alolan:
+            name = 'Alolan ' + name
+        if self.shiny:
+            name = 'Shiny ' + name
+        return name
+
+    async def get_pb_raid(self, weather=None, userid=None, moveset=None):
+        """Get a PokeBattler Raid for this Pokemon
+
+        This can quickly produce a PokeBattler Raid for the current
+        Pokemon, with the option of providing a PokeBattler User ID to
+        get customised results.
+
+        The resulting PokeBattler Raid object will be saved under the
+        `pb_raid` attribute of the Pokemon instance for later retrieval,
+        unless it's customised with an ID.
+
+        Parameters
+        -----------
+        weather: :class:`str`, optional
+            The weather during the raid
+        userid: :class:`int`, optional
+            The Pokebattler User ID to generate the PB Raid with
+        moveset: list or tuple, optional
+            A :class:`list` or :class:`tuple` with a :class:`str` representing
+            ``move1`` and ``move2`` of the Pokemon.
+
+        Returns
+        --------
+        :class:`eevee.cogs.pokebattler.objects.PBRaid` or :obj:`None`
+            PokeBattler Raid instance or None if not a Raid Pokemon.
+
+        Example
+        --------
+
+        .. code-block:: python3
+
+            pokemon = Pokemon(ctx.bot, 'Groudon')
+            moveset = ('Dragon Tail', 'Solar Beam')
+            pb_raid = pokemon.get_pb_raid('windy', 12345, moveset)
+        """
+
+        # if a Pokebattler Raid exists with the same settings, return it
+        if self.pb_raid:
+            if not (weather or userid) and not moveset:
+                return self.pb_raid
+            if weather:
+                self.pb_raid.change_weather(weather)
+
+        # if it doesn't exist or settings changed, generate it
+        else:
+            pb_cog = self.bot.cogs.get('PokeBattler', None)
+            if not pb_cog:
+                return None
+            if not weather:
+                weather = self.weather or 'DEFAULT'
+            weather = pb_cog.PBRaid.get_weather(weather)
+            pb_raid = await pb_cog.PBRaid.get(
+                self.bot, self, weather=self.weather, userid=userid)
+
+        # set the moveset for the Pokebattler Raid
+        if not moveset:
+            moveset = self.moveset
+        try:
+            pb_raid.set_moveset(moveset)
+        except RuntimeError:
+            pass
+
+        # don't save it if it's a user-specific Pokebattler Raid
+        if not userid:
+            self.pb_raid = pb_raid
+
+        return pb_raid
+
+    @property
+    def img_url(self):
+        """:class:`str` : Pokemon sprite image URL"""
+        pkmn_no = str(self.id).zfill(3)
+        if self.form:
+            if self.form == '?':
+                form_str = 'question'
+            else:
+                form_str = self.form
+        else:
+            form_str = ""
+        if self.alolan:
+            alolan_str = "a"
+        else:
+            alolan_str = ""
+        if self.shiny:
+            shiny_str = "s"
+        else:
+            shiny_str = ""
+        return ("https://raw.githubusercontent.com/FoglyOgly/"
+                f"Meowth/discordpy-v1/images/pkmn/{pkmn_no}{form_str}"
+                f"_{alolan_str}{shiny_str}.png?cache=3")
+
+    # async def colour(self):
+    #     """:class:`discord.Colour` : Discord colour based on Pokemon sprite."""
+    #     return await url_color(self.img_url)
+
+    @property
+    def is_raid(self):
+        """:class:`bool` : Indicates if the pokemon can show in Raids"""
+        return self.id in utils.get_raidlist(self.bot)
+
+    @property
+    def is_exraid(self):
+        """:class:`bool` : Indicates if the pokemon can show in Raids"""
+        if not self.is_raid:
+            return False
+        return self.id in self.bot.raid_info['raid_eggs']['EX']['pokemon']
+
+    @property
+    def raid_level(self):
+        """:class:`int` or :obj:`None` : Returns raid egg level"""
+        return utils.get_level(self.bot, self.id)
+
+    # def max_raid_cp(self, weather_boost=False):
+    #     """:class:`int` or :obj:`None` : Returns max CP on capture after raid
+    #     """
+    #     key = "max_cp_w" if weather_boost else "max_cp"
+    #     return self.bot.raid_pokemon[self.name][key] if self.is_raid else None
+
+    def role(self, guild=None):
+        """:class:`discord.Role` or :obj:`None` : Returns the role for
+        this Pokemon
+        """
+        if not guild:
+            guild = self.guild
+        if not guild:
+            return None
+        return discord.utils.get(guild.roles, name=self.name)
+
+    def set_guild(self, guild):
+        """:class:`discord.Guild` or :obj:`None` : Sets the relevant Guild"""
+        self.guild = guild
+
+    @property
+    def weak_against(self):
+        """:class:`dict` : Returns a dict of all types the Pokemon is
+        weak against.
+        """
+        types_eff = {}
+        for t, v in self.type_effects.items():
+            if round(v, 3) > 1:
+                types_eff[t] = v
+        return types_eff
+
+    @property
+    def strong_against(self):
+        """:class:`dict` : Returns a dict of all types the Pokemon is
+        strong against.
+        """
+        types_eff = {}
+        for t, v in self.type_effects.items():
+            if round(v, 3) < 1:
+                types_eff[t] = v
+        return types_eff
+
+    def _get_type(self):
+        """:class:`list` : Returns the Pokemon's types"""
+        return self.bot.type_list[self.id-1]
+
+    @property
+    def type_effects(self):
+        """:class:`dict` : Returns a dict of all Pokemon types and their
+        relative effectiveness as values.
+        """
+        type_eff = {}
+        for _type in self.types:
+            for atk_type in self.bot.type_chart[_type]:
+                if atk_type not in type_eff:
+                    type_eff[atk_type] = 1
+                type_eff[atk_type] *= self.bot.type_chart[_type][atk_type]
+        return type_eff
+
+    @property
+    def type_effects_grouped(self):
+        """:class:`dict` : Returns a dict of all Pokemon types and their
+        relative effectiveness as values, grouped by the following:
+            * ultra
+            * super
+            * low
+            * worst
+        """
+        type_eff_dict = {
+            'ultra' : [],
+            'super' : [],
+            'low'   : [],
+            'worst' : []
+        }
+        for t, v in self.type_effects.items():
+            if v > 1.9:
+                type_eff_dict['ultra'].append(t)
+            elif v > 1.3:
+                type_eff_dict['super'].append(t)
+            elif v < 0.6:
+                type_eff_dict['worst'].append(t)
+            else:
+                type_eff_dict['low'].append(t)
+        return type_eff_dict
+
+    @classmethod
+    async def convert(cls, ctx, argument):
+        """Returns a pokemon that matches the value
+        of the argument that's being converted.
+
+        It first will check if it's a valid ID, and if not, will perform
+        a fuzzymatch against the list of Pokemon names.
+
+        Returns
+        --------
+        :class:`Pokemon` or :class:`dict`
+            If there was a close or exact match, it will return a valid
+            :class:`Pokemon`.
+            If the match is lower than 80% likeness, it will return a
+            :class:`dict` with the following keys:
+                * ``suggested`` - Next best guess based on likeness.
+                * ``original`` - Original value of argument provided.
+
+        Raises
+        -------
+        :exc:`discord.ext.commands.BadArgument`
+            The argument didn't match a Pokemon ID or name.
+        """
+        argument = argument.lower()
+        if 'shiny' in argument.lower():
+            shiny = True
+            argument = argument.replace('shiny', '').strip()
+        else:
+            shiny = False
+        if 'alolan' in argument.lower():
+            alolan = True
+            argument = argument.replace('alolan', '').strip()
+        else:
+            alolan = False
+        form_list = [
+            'normal', 'sunny', 'rainy', 'snowy', 'sunglasses',
+            'ash', 'party', 'witch', 'santa', 'summer',
+            'defense', 'normal', 'attack', 'speed',
+            '1', '2', '3', '4', '5', '6', '7', '8', '!', '?'
+        ]
+        form_list.extend(' ' + c for c in ascii_lowercase)
+        f = next((x for x in form_list if x in argument.lower()), None)
+        if f:
+            form = f.strip()
+            argument = argument.replace(f, '').strip()
+        else:
+            form = None
+        if argument.isdigit():
+            try:
+                match = ctx.bot.pkmn_info['pokemon_list'][int(argument)-1]
+                score = 100
+            except IndexError:
+                raise commands.errors.BadArgument(
+                    'Pokemon ID "{}" not valid'.format(argument))
+        else:
+            pkmn_list = ctx.bot.pkmn_info['pokemon_list']
+            match, score = utils.get_match(pkmn_list, argument)
+        if match:
+            if score >= 80:
+                result = cls(ctx.bot, str(match), ctx.guild, shiny=shiny, alolan=alolan, form=form)
+            else:
+                result = {
+                    'suggested' : str(match),
+                    'original'   : argument
+                }
+
+        if not result:
+            raise commands.errors.BadArgument(
+                'Pokemon "{}" not valid'.format(argument))
+
+        return result
+
+    @classmethod
+    def get_pokemon(cls, ctx, argument):
+        argument = argument.lower()
+        if 'shiny' in argument.lower():
+            shiny = True
+            argument = argument.replace('shiny', '').strip()
+        else:
+            shiny = False
+        if 'alolan' in argument.lower():
+            alolan = True
+            argument = argument.replace('alolan', '').strip()
+        else:
+            alolan = False
+        form_list = [
+            'normal', 'sunny', 'rainy', 'snowy', 'sunglasses',
+            'ash', 'party', 'witch', 'santa', 'summer',
+            'defense', 'normal', 'attack', 'speed',
+            '1', '2', '3', '4', '5', '6', '7', '8', '!', '?'
+        ]
+        form_list.extend(' ' + c for c in ascii_lowercase)
+        f = next((x for x in form_list if x in argument.lower()), None)
+        if f:
+            form = f.strip()
+            argument = argument.replace(f, '').strip()
+        else:
+            form = None
+        if argument.isdigit():
+            try:
+                match = ctx.bot.pkmn_info['pokemon_list'][int(argument)-1]
+            except IndexError:
+                return None
+        else:
+            pkmn_list = ctx.bot.pkmn_info['pokemon_list']
+            match = utils.get_match(pkmn_list, argument)[0]
+
+        if not match:
+            return None
+
+        return cls(ctx.bot, str(match), ctx.guild, shiny=shiny, alolan=alolan, form=form)
+
+
+def setup(bot):
+    bot.add_cog(Pokedex(bot))
diff --git a/meowth/exts/silph.py b/meowth/exts/silph.py
new file mode 100644
index 000000000..7bde87138
--- /dev/null
+++ b/meowth/exts/silph.py
@@ -0,0 +1,320 @@
+import datetime
+import dateparser
+import aiohttp
+
+import discord
+from discord.ext import commands
+from meowth import utils
+
+class SilphBadge:
+
+    __slots__ = ('count', '_awarded', 'slug', 'name', 'description', 'image_url')
+
+    def __init__(self, data):
+        self.count = data.get('count')
+        badge_info = data.get('Badge', {})
+        self.slug = badge_info.get('slug')
+        self.name = badge_info.get('name')
+        self.description = badge_info.get('description')
+        self.image_url = badge_info.get('image_url')
+        self._awarded = data.get('awarded')
+
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        type_name = type(self).__name__
+        name = self.name
+        created = self.awarded()
+        return f"<{type_name} name='{name}' awarded='{created}'>"
+
+    def awarded(self, utc_offset=None):
+        if not self._awarded:
+            return None
+        date = dateparser.parse(self._awarded, settings={'TIMEZONE': 'UTC'})
+        if utc_offset:
+            date = date + datetime.timedelta(hours=utc_offset)
+        return date.date().isoformat()
+
+class SilphCheckin:
+
+    __slots__ = ('name', 'description', 'image_url', '_is_global', '_start',
+                 '_end', '_created')
+
+    def __init__(self, data):
+        self.name = data.get('name')
+        self.description = data.get('description')
+        self.image_url = data.get('image')
+        self._is_global = data.get('is_global')
+        event_checkin_data = data.get('EventCheckin', {})
+        self._created = event_checkin_data.get('created')
+
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        type_name = type(self).__name__
+        name = self.name
+        created = self.created()
+        return f"<{type_name} name='{name}' created='{created}'>"
+
+    @property
+    def is_global(self):
+        if not self._is_global:
+            return None
+        return utils.convert_to_bool(self._is_global)
+
+    def created(self, utc_offset=None):
+        if not self._created:
+            return None
+        date = dateparser.parse(self._created, settings={'TIMEZONE': 'UTC'})
+        if utc_offset:
+            date = date + datetime.timedelta(hours=utc_offset)
+        return date.date().isoformat()
+
+class SilphCard:
+
+    __slots__ = ('id', 'home_region', 'team', 'title', 'playstyle', 'level',
+                 'avatar_url', 'silph_name', 'game_name', 'url',
+                 'data_url', '_badges', '_top_6_pokemon', '_nest_migrations',
+                 '_pokedex_count', '_xp', '_raid_average', '_goal', '_joined',
+                 '_modified', '_connected_accounts', '_checkins', '_handshakes')
+
+    def __init__(self, silph_username, data):
+        data = data.get('data', data)
+        self.silph_name = silph_username
+        self.game_name = data.get('in_game_username')
+        self.data_url = f'https://sil.ph/{silph_username}.json'
+        self.url = f'https://sil.ph/{silph_username}'
+        self.id = data.get('card_id')
+        self.home_region = data.get('home_region')
+        self.team = data.get('team')
+        self.title = data.get('title')
+        self.playstyle = data.get('playstyle')
+        self.level = data.get('trainer_level')
+        self.avatar_url = data.get('avatar')
+        self._badges = data.get('badges')
+        self._top_6_pokemon = data.get('top_6_pokemon')
+        self._nest_migrations = data.get('nest_migrations')
+        self._pokedex_count = data.get('pokedex_count')
+        self._xp = data.get('xp')
+        self._raid_average = data.get('raid_average')
+        self._handshakes = data.get('handshakes')
+        self._goal = data.get('goal')
+        self._joined = data.get('joined')
+        self._modified = data.get('modified')
+        self._connected_accounts = data.get('socials')
+        self._checkins = data.get('checkins')
+
+    def __str__(self):
+        return f"{self.id} - {self.silph_name}"
+
+    def __repr__(self):
+        type_name = type(self).__name__
+        name = self.silph_name
+        ign = self.game_name
+        return f"<{type_name} id='{self.id}' silph_name='{name}' ign='{ign}'>"
+
+    def get_connected_account(self, vendor):
+        con_acc = self._connected_accounts
+        search = (acc for acc in con_acc if acc.get('vendor') == vendor)
+        return next(search, None)
+
+    @property
+    def badges(self):
+        if not self._badges:
+            return None
+        return tuple(SilphBadge(b) for b in self._badges)
+
+    @property
+    def badge_count(self):
+        if not self._badges:
+            return 0
+        return len(self._badges)
+
+    @property
+    def checkins(self):
+        if not self._badges:
+            return None
+        return tuple(SilphCheckin(c) for c in self._checkins)
+
+    @property
+    def checkin_count(self):
+        if not self._badges:
+            return 0
+        return len(self._checkins)
+
+    @property
+    def top_pkmn(self):
+        if not self._top_6_pokemon:
+            return None
+        return tuple(self._top_6_pokemon)
+
+    @property
+    def migrations(self):
+        return int(self._nest_migrations) if self._nest_migrations else 0
+
+    @property
+    def pd_count(self):
+        return int(self._pokedex_count) if self._pokedex_count else 0
+
+    @property
+    def xp(self):
+        return int(self._xp) if self._xp else 0
+
+    @property
+    def raid_avg(self):
+        return int(self._raid_average) if self._raid_average else 0
+
+    @property
+    def handshakes(self):
+        return int(self._handshakes) if self._handshakes else 0
+
+    @property
+    def goal(self):
+        return self._goal.lower() if self._goal else None
+
+    @property
+    def discord_name(self):
+        data = self.get_connected_account('Discord')
+        return data.get('username') if data else None
+
+    def joined(self, utc_offset=None):
+        if not self._joined:
+            return None
+        date = dateparser.parse(self._joined, settings={'TIMEZONE': 'UTC'})
+        if utc_offset:
+            date = date + datetime.timedelta(hours=utc_offset)
+        return date.date().isoformat()
+
+    def modified(self, utc_offset=None):
+        if not self._modified:
+            return None
+        date = dateparser.parse(self._modified, settings={'TIMEZONE': 'UTC'})
+        if utc_offset:
+            date = date + datetime.timedelta(hours=utc_offset)
+        return date.date().isoformat()
+
+    def embed(self, utc_offset=None):
+
+        colour = discord.Colour(0xe8c13c)
+        hyperlink_icon = "https://i.imgur.com/fn9E5nb.png"
+        silph_icon = "https://assets.thesilphroad.com/img/snoo_sr_icon.png"
+
+        if not self.discord_name:
+            connected_str = "\u2754 **Discord Not Provided**"
+        else:
+            connected_str = (
+                f"\u2611 **Connected to Discord:** {self.discord_name}")
+
+        embed = discord.Embed(
+            title='Playstyle', colour=colour, description=(
+                f"{self.playstyle}, working on {self.goal}.\n"
+                f"Active around {self.home_region}.\n\n"
+                f"{connected_str}"))
+
+        embed.set_thumbnail(url=self.avatar_url)
+
+        embed.set_author(
+            name=(
+                f"{self.title} {self.game_name} - "
+                f"Level {self.level} {self.team}"),
+            url=self.url,
+            icon_url=hyperlink_icon)
+
+        embed.add_field(
+            name="__Silph Stats__",
+            value=(
+                f"**Joined:** {self.joined(utc_offset)}\n"
+                f"**Badges:** {self.badge_count}\n"
+                f"**Check-ins:** {self.checkin_count}\n"
+                f"**Handshakes:** {self.handshakes}\n"
+                f"**Migrations:** {self.migrations}"),
+            inline=True)
+
+        embed.add_field(
+            name="__Game Stats__",
+            value=(
+                f"**Name:** {self.game_name}\n"
+                f"**Team:** {self.team}\n"
+                f"**Level:** {self.level}\n"
+                f"**Pokedex:** {self.pd_count}\n"
+                f"**Raids:** {self.raid_avg}/week"),
+            inline=True)
+
+        embed.set_footer(
+            text=(
+                f"Silph Road Travelers Card - ID{self.id} - "
+                f"Updated {self.modified(utc_offset)}"),
+            icon_url=silph_icon)
+
+        return embed
+
+    @classmethod
+    async def get_trainer_card(cls, silph_user):
+        url = f'https://sil.ph/{silph_user}.json'
+        async with aiohttp.ClientSession() as sess:
+            async with sess.get(url) as resp:
+                data = await resp.json()
+        if data.get('error', None):
+            return None
+        return cls(silph_user, data)
+
+class SilphTrainer:
+    def __init__(self, silph_user):
+        self.name = silph_user
+        self.card = None
+
+    async def load_card_data(self):
+        self.card = await SilphCard.get_trainer_card(self.name)
+        return self.card
+
+    @classmethod
+    async def load_trainer_data(cls, silph_user):
+        instance = cls(silph_user)
+        await instance.load_card_data()
+        return instance
+
+class Silph:
+    """Silph intergrations."""
+    def __init__(self, bot):
+        self.bot = bot
+
+    def get_silph_profile_lazy(self, silph_user):
+        return SilphTrainer(silph_user)
+
+    async def get_silph_profile(self, silph_user):
+        return await SilphTrainer.load_trainer_data(silph_user)
+
+    async def get_silph_card(self, silph_user):
+        return await SilphCard.get_trainer_card(silph_user)
+
+    @commands.command()
+    async def silphcard(self, ctx, silph_user: str = None):
+        """Displays a user's Silph Road Trainer Card."""
+        guild_data = ctx.bot.guild_dict[ctx.guild.id]
+        if not silph_user:
+            silph_user = guild_data['trainers'].setdefault(ctx.author.id, {}).get('silphid', None)
+            if not silph_user:
+                return await ctx.error(f"You haven't setup a silphcard!")
+        else:
+            if ctx.message.mentions:
+                mentioned = ctx.message.mentions[0]
+                silph_user = guild_data['trainers'].setdefault(
+                    mentioned.id, {}).get('silphid', None)
+                if not silph_user:
+                    return await ctx.error(
+                        f"{mentioned.display_name} hasn't setup a silphcard!")
+        async with ctx.typing():
+            card = await SilphCard.get_trainer_card(silph_user)
+        try:
+            offset = guild_data['configure_dict']['settings']['offset']
+        except KeyError:
+            offset = None
+        if card:
+            await ctx.send(embed=card.embed(offset))
+        else:
+            await ctx.error(f'Silph Card for {silph_user} not found.')
+
+def setup(bot):
+    bot.add_cog(Silph(bot))
diff --git a/meowth/exts/trade.py b/meowth/exts/trade.py
new file mode 100644
index 000000000..fc88c3135
--- /dev/null
+++ b/meowth/exts/trade.py
@@ -0,0 +1,455 @@
+import asyncio
+import functools
+
+import discord
+from discord.ext import commands
+
+from meowth import utils, checks
+
+from meowth.exts import pokemon
+
+
+class Trade:
+
+    icon_url = ("https://raw.githubusercontent.com/FoglyOgly/Meowth/"
+                "discordpy-v1/images/misc/trade_icon_small.png")
+
+    __slots__ = [
+        'bot', '_data', 'lister_id', 'listing_id', 'report_channel_id',
+        'guild_id', 'offers']
+
+    def __init__(self, bot, lister_id, message_id, channel_id, guild_id,
+                 wanted_pokemon, offered_pokemon):
+        self.bot = bot
+        trade_dict = bot.guild_dict[guild_id].setdefault('trade_dict', {})
+        trade_channel_data = trade_dict.setdefault(channel_id, {})
+        trade_channel_data[message_id] = {
+            'lister_id'         : lister_id,
+            'report_channel_id' : channel_id,
+            'guild_id'          : guild_id,
+            'wanted_pokemon'    : [str(want) for want in wanted_pokemon],
+            'offered_pokemon'   : str(offered_pokemon),
+            'offers'            : {}
+        }
+        self._data = trade_channel_data[message_id]
+        self.lister_id = self._data['lister_id']
+        self.listing_id = message_id
+        self.report_channel_id = self._data['report_channel_id']
+        self.guild_id = self._data['guild_id']
+        self.offers = self._data['offers']
+
+    async def on_raw_reaction_add(self, payload):
+
+        emoji = payload.emoji.name
+
+        # ignore if not relevant to this trade object
+        if payload.message_id != self.listing_id:
+            return
+
+        emoji_check = [
+            '\u20e3' in emoji, # keycap 1-9
+            emoji == '\u23f9' # stop button
+        ]
+
+        if not any(emoji_check):
+            return
+
+        if payload.user_id != self.lister_id and payload.user_id != self.bot.user.id and '\u20e3' in emoji:
+            wanted_pokemon = await self.wanted_pokemon()
+            i = int(emoji[0])
+            offer = wanted_pokemon[i-1]
+            await self.make_offer(payload.user_id, offer)
+
+        elif payload.user_id == self.lister_id and emoji == '\u23f9':
+            await self.cancel_trade()
+
+    @property
+    def guild(self):
+        return self.bot.get_guild(self.guild_id)
+
+    @property
+    def listing_channel(self):
+        return self.guild.get_channel(self.report_channel_id)
+
+    @property
+    def lister(self):
+        return self.guild.get_member(self.lister_id)
+
+    @staticmethod
+    def make_trade_embed(lister, wanted_pokemon, offered_pokemon):
+        """Returns a formatted embed message with trade details."""
+
+        wants = [
+            f'{i+1}\u20e3: {pkmn}' for i, pkmn in enumerate(wanted_pokemon)
+        ]
+
+        return utils.make_embed(
+            title="Pokemon Trade - {}".format(lister.display_name),
+            msg_colour=utils.colour(lister.guild),
+            icon=Trade.icon_url,
+            fields={
+                "Wants":'\n'.join(wants),
+                "Offers": str(offered_pokemon)
+                },
+            inline=True,
+            footer=lister.display_name,
+            footer_icon=lister.avatar_url_as(format='png', size=256),
+            thumbnail=offered_pokemon.img_url
+        )
+
+    @staticmethod
+    def make_offer_embed(trader, listed_pokemon, offer):
+        return utils.make_embed(
+            title="Pokemon Trade Offer - {}".format(trader.display_name),
+            msg_colour=utils.colour(trader.guild),
+            icon=Trade.icon_url,
+            fields={
+                "You Offered": str(listed_pokemon),
+                "They Offer": str(offer)
+                },
+            inline=True,
+            footer=trader.display_name,
+            footer_icon=trader.avatar_url_as(format='png', size=256),
+            thumbnail=offer.img_url
+        )
+
+    @classmethod
+    async def create_trade(cls, ctx, wanted_pokemon, offered_pokemon):
+        """Creates a trade object and sends trade details in channel"""
+
+        trade_embed = cls.make_trade_embed(
+            ctx.author, wanted_pokemon, offered_pokemon)
+
+        role = offered_pokemon.role(ctx.guild)
+        if role:
+            rolestr = role.mention + " - "
+        else:
+            rolestr = ""
+
+        offer_str = ("{role}Meowth! {lister} offers a {pkmn} up for trade!"
+                     "").format(role=rolestr, lister=ctx.author.display_name,
+                                pkmn=offered_pokemon)
+
+        instructions = "React to this message to make an offer!"
+
+        codemsg = ""
+        if ctx.author.id in ctx.bot.guild_dict[ctx.guild.id].get('trainers',{}):
+            trainercode = ctx.bot.guild_dict[ctx.guild.id]['trainers'][ctx.author.id].get('trainercode', None)
+            if trainercode:
+                codemsg += _("{user}\'s trainer code is: **{code}**").format(user=ctx.author.display_name, code=trainercode)
+
+        cancel_inst = ("{lister} may cancel the trade with :stop_button:"
+                       "").format(lister=ctx.author.display_name)
+
+        trade_msg = await ctx.send(
+            f"{offer_str}\n\n{instructions}\n\n{cancel_inst}\n\n{codemsg}",
+            embed=trade_embed)
+
+        for i in range(len(wanted_pokemon)):
+            await trade_msg.add_reaction(f'{i+1}\u20e3')
+        await trade_msg.add_reaction('\u23f9')
+
+        trade = cls(
+            ctx.bot, ctx.author.id, trade_msg.id, ctx.channel.id, ctx.guild.id,
+            wanted_pokemon, offered_pokemon
+        )
+
+        ctx.bot.add_listener(trade.on_raw_reaction_add)
+
+        return trade
+
+    @classmethod
+    def from_data(cls, bot, message_id, data):
+        trade = cls(
+            bot, data['lister_id'], message_id, data['report_channel_id'],
+            data['guild_id'], data['wanted_pokemon'], data['offered_pokemon']
+        )
+
+        bot.add_listener(trade.on_raw_reaction_add)
+
+        return trade
+
+    async def get_listmsg(self):
+        return await self.listing_channel.get_message(self.listing_id)
+
+    async def offered_pokemon(self):
+        listingmsg = await self.get_listmsg()
+        ctx = await self.bot.get_context(listingmsg)
+        return pokemon.Pokemon.get_pokemon(ctx, self._data['offered_pokemon'])
+
+    async def wanted_pokemon(self):
+        listingmsg = await self.get_listmsg()
+        ctx = await self.bot.get_context(listingmsg)
+        return [pokemon.Pokemon.get_pokemon(ctx, want) for want in self._data['wanted_pokemon']]
+
+    async def make_offer(self, trader_id, pkmn):
+        offered_pokemon = await self.offered_pokemon()
+        self.offers[trader_id] = str(pkmn)
+        trader = self.guild.get_member(trader_id)
+        offer_embed = self.make_offer_embed(trader, offered_pokemon, pkmn)
+
+        offermsg = await self.lister.send(
+            ("Meowth! {} offers to trade their {} for your {}! "
+             "React with :white_check_mark: to accept the offer or "
+             ":negative_squared_cross_mark: to reject it!").format(
+                 trader.display_name, pkmn, offered_pokemon),
+            embed=offer_embed)
+
+        reaction, __ = await utils.ask(self.bot, offermsg, timeout=None)
+
+        if reaction.emoji == '\u2705':
+            await self.accept_offer(trader_id)
+
+        elif reaction.emoji == '\u274e':
+            await self.reject_offer(trader_id)
+            await offermsg.delete()
+
+    async def accept_offer(self, offer_id):
+        offer = self.offers[offer_id]
+        trader = self.guild.get_member(offer_id)
+        lister = self.lister
+        listingmsg = await self.get_listmsg()
+
+        ctx = await self.bot.get_context(listingmsg)
+        offer = pokemon.Pokemon.get_pokemon(ctx, offer)
+        offered_pokemon = await self.offered_pokemon()
+
+        acceptedmsg = (
+            "Meowth! {} has agreed to trade their {} for {}'s {}\n\n"
+            "Please DM them to coordinate the trade! "
+            "React with :ballot_box_with_check: when the trade has been "
+            "completed! To reject or cancel this offer, react with "
+            ":stop_button:").format(
+                self.lister.display_name,
+                offered_pokemon,
+                trader.display_name,
+                offer)
+
+        special_check = [
+            offered_pokemon.shiny,
+            offered_pokemon.legendary,
+            offer.shiny,
+            offer.legendary
+        ]
+
+        if any(special_check):
+            acceptedmsg += (
+                "\n\nThis is a Special Trade! These can only be "
+                "completed once per day and can cost up to 1 million "
+                "stardust! Significant discounts can be earned by leveling "
+                "up your friendship before the trade is made!")
+
+        tradermsg = await trader.send(acceptedmsg)
+        listermsg = await lister.send(acceptedmsg)
+
+        await tradermsg.add_reaction('\u2611')
+        await tradermsg.add_reaction('\u23f9')
+        await listermsg.add_reaction('\u2611')
+        await listermsg.add_reaction('\u23f9')
+
+        for offerid in self.offers.keys():
+            if offerid != offer_id:
+                reject = self.guild.get_member(offerid)
+                try:
+                    await reject.send((
+                        "Meowth... {} accepted a competing offer for their {}."
+                        "").format(self.lister.display_name, offered_pokemon))
+                except discord.HTTPException:
+                    pass
+
+
+
+        await listingmsg.edit(
+            content="Meowth! {} has accepted an offer!".format(
+                self.lister.display_name),
+            )
+
+        await listingmsg.clear_reactions()
+
+        trader_confirms = False
+        lister_confirms = False
+
+        def check(r, u):
+            user_check = [u == trader, u == lister]
+            msg_check = [r.message.id == tradermsg.id, r.message.id == listermsg.id]
+            emoji_check = [r.emoji == '\u2611', r.emoji == '\u23f9']
+            if not any(msg_check) or not any(user_check) or not any(emoji_check):
+                return False
+            else:
+                return True
+
+        while True:
+            reaction, user = await self.bot.wait_for('reaction_add', check=check)
+            if user.id == trader.id:
+                if reaction.emoji == '\u2611':
+                    trader_confirms = True
+                elif reaction.emoji == '\u23f9':
+                    await tradermsg.delete()
+                    return await self.withdraw_offer(trader.id)
+            elif user.id == lister.id:
+                if reaction.emoji == '\u2611':
+                    lister_confirms = True
+                elif reaction.emoji == '\u23f9':
+                    await listermsg.delete()
+                    return await self.reject_offer(trader.id)
+            if trader_confirms and lister_confirms:
+                await listermsg.delete()
+                await tradermsg.delete()
+                return await self.confirm_trade()
+            else:
+                continue
+
+        # update the listing message if it still exists
+        # dm others who offered saying the trade was completed
+        # dm the member with the successful offer with details for trade
+        # maybe ask the lister to provide a friend code optionally before dm
+
+    async def withdraw_offer(self, offer_id):
+        offered_pokemon = await self.offered_pokemon()
+        wanted_pokemon = await self.wanted_pokemon()
+        listingmsg = await self.get_listmsg()
+        trader = self.guild.get_member(offer_id)
+        await self.lister.send(
+            "Meowth... {} withdrew their trade offer of {}.".format(
+                trader.display_name, self.offers[offer_id]))
+
+        offer_str = "Meowth! {lister} offers a {pkmn} up for trade!".format(
+            lister=self.lister.display_name, pkmn=offered_pokemon)
+
+        instructions = "React to this message to make an offer!"
+        cancel_inst = "{lister} may cancel the trade with :stop_button:".format(
+            lister=self.lister.display_name)
+
+        await listingmsg.edit(
+            content=f"{offer_str}\n\n{instructions}\n\n{cancel_inst}",
+            )
+
+        for i in range(len(wanted_pokemon)):
+            await listingmsg.add_reaction(f'{i+1}\u20e3')
+
+        await listingmsg.add_reaction('\u23f9')
+        del self.offers[offer_id]
+
+    async def reject_offer(self, offer_id):
+        listingmsg = await self.get_listmsg()
+        trader = self.guild.get_member(offer_id)
+        offered_pokemon = await self.offered_pokemon()
+        wanted_pokemon = await self.wanted_pokemon()
+
+        await trader.send(
+            "Meowth... {} rejected your offer for their {}.".format(
+                self.lister.display_name, offered_pokemon))
+
+        offer_str = "Meowth! {lister} offers a {pkmn} up for trade!".format(
+            lister=self.lister.display_name, pkmn=offered_pokemon)
+
+        instructions = "React to this message to make an offer!"
+        cancel_inst = "{lister} may cancel the trade with :stop_button:".format(
+            lister=self.lister.display_name)
+
+        await listingmsg.edit(
+            content=f"{offer_str}\n\n{instructions}\n\n{cancel_inst}",
+            )
+
+        for i in range(len(wanted_pokemon)):
+            await listingmsg.add_reaction(f'{i+1}\u20e3')
+
+        await listingmsg.add_reaction('\u23f9')
+
+        del self.offers[offer_id]
+
+    async def cancel_trade(self):
+        offered_pokemon = await self.offered_pokemon()
+        for offerid in self.offers:
+            reject = self.guild.get_member(offerid)
+
+            await reject.send(
+                "Meowth... {} canceled their trade offer of {}".format(
+                    self.lister.display_name, offered_pokemon))
+
+        await self.close_trade()
+
+        # update the listing message if it still exists
+        # dm those who offered saying the trade was cancelled
+
+    async def confirm_trade(self):
+        listingmsg = await self.get_listmsg()
+        await listingmsg.edit(content='Meowth! This trade has been completed!', embed=None)
+        await asyncio.sleep(5)
+        await self.close_trade()
+
+    async def close_trade(self):
+        listingmsg = await self.get_listmsg()
+        await listingmsg.delete()
+        self.bot.remove_listener(self.on_raw_reaction_add)
+        try:
+            guild_trades = self.bot.guild_dict[self.guild_id]['trade_dict']
+            del guild_trades[self.report_channel_id][self.listing_id]
+            await listingmsg.delete()
+        except (KeyError, discord.HTTPException):
+            pass
+
+class Trading:
+    def __init__(self, bot):
+        self.bot = bot
+        for guild_id in self.bot.guild_dict:
+            trade_dict = self.bot.guild_dict[guild_id].setdefault('trade_dict', {})
+            for channel_id in trade_dict:
+                trade_channel_data = trade_dict[channel_id]
+                for message_id in trade_channel_data:
+                    Trade.from_data(
+                        self.bot, message_id, trade_channel_data[message_id])
+
+    async def on_message(self, message):
+        ctx = await self.bot.get_context(message)
+        if not ctx.guild:
+            return
+        if checks.check_tradereport(ctx) and message.author != ctx.guild.me:
+            await asyncio.sleep(1)
+            try:
+                await message.delete()
+            except discord.HTTPException:
+                pass
+
+    @commands.command()
+    @checks.allowtrade()
+    async def trade(self, ctx, *, offer: pokemon.Pokemon):
+        """Create a trade listing."""
+
+        if type(offer) == dict:
+            trade_error = await ctx.send(
+                f"{ctx.author.display_name}, check your spelling and make sure "
+                f"you are only listing one pokemon.")
+            await asyncio.sleep(5)
+            await trade_error.delete()
+            return
+
+        want_ask = await ctx.send(
+            f"{ctx.author.display_name}, what Pokemon are you willing to accept "
+            f"in exchange for {str(offer)}?")
+
+        def check(m):
+            return m.author == ctx.author and m.channel == ctx.channel
+
+        try:
+            want_reply = await ctx.bot.wait_for('message', check=check, timeout=60)
+        except asyncio.TimeoutError:
+            await want_ask.delete()
+            return
+
+        wants = want_reply.content.lower().split(',')
+
+        await want_ask.delete()
+        await want_reply.delete()
+
+        pkmn_convert = functools.partial(pokemon.Pokemon.get_pokemon, ctx)
+
+        wants = map(str.strip, wants)
+        wants = map(pkmn_convert, wants)
+        wants = [str(want) for want in wants]
+
+        await Trade.create_trade(ctx, wants, offer)
+
+
+def setup(bot):
+    bot.add_cog(Trading(bot))
diff --git a/meowth/exts/tutorial.py b/meowth/exts/tutorial.py
new file mode 100644
index 000000000..edd9feae6
--- /dev/null
+++ b/meowth/exts/tutorial.py
@@ -0,0 +1,829 @@
+import asyncio
+
+import discord
+from discord.ext import commands
+
+
+from meowth import utils
+from meowth import checks
+from meowth.exts import trade
+
+class Tutorial:
+    def __init__(self, bot):
+        self.bot = bot
+
+    async def wait_for_cmd(self, tutorial_channel, newbie, command_name):
+
+        # build check relevant to command
+        def check(c):
+            if not c.channel == tutorial_channel:
+                return False
+            if not c.author == newbie:
+                return False
+            if c.command.name == command_name:
+                return True
+            return False
+
+        # wait for the command to complete
+        cmd_ctx = await self.bot.wait_for(
+            'command_completion', check=check, timeout=300)
+
+        return cmd_ctx
+
+    def get_overwrites(self, guild, member):
+        return {
+            guild.default_role: discord.PermissionOverwrite(
+                read_messages=False),
+            member: discord.PermissionOverwrite(
+                read_messages=True,
+                send_messages=True,
+                manage_channels=True),
+            guild.me: discord.PermissionOverwrite(
+                read_messages=True)
+            }
+
+    async def want_tutorial(self, ctx, config):
+        report_channels = config['want']['report_channels']
+        report_channels.append(ctx.tutorial_channel.id)
+
+        await ctx.tutorial_channel.send(
+            f"This server utilizes the **{ctx.prefix}want** command to help "
+            "members receive push notifications about Pokemon they want! "
+            "I create Discord roles for each Pokemon that people want, "
+            "and @mentioning these roles will send a notification to "
+            f"anyone who **{ctx.prefix}want**-ed that Pokemon!\n"
+            f"Try the {ctx.prefix}want command!\n"
+            f"Ex: `{ctx.prefix}want unown`")
+
+        try:
+            await self.wait_for_cmd(ctx.tutorial_channel, ctx.author, 'want')
+
+            # acknowledge and wait a second before continuing
+            await ctx.tutorial_channel.send("Great job!")
+            await asyncio.sleep(1)
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await ctx.tutorial_channel.send(
+                f"You took too long to complete the **{ctx.prefix}want** "
+                "command! This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+            await ctx.tutorial_channel.delete()
+
+            return False
+
+        # clean up by removing tutorial from report channel config
+        finally:
+            report_channels.remove(ctx.tutorial_channel.id)
+
+        return True
+
+    async def wild_tutorial(self, ctx, config):
+        report_channels = config['wild']['report_channels']
+        report_channels[ctx.tutorial_channel.id] = 'test'
+
+        await ctx.tutorial_channel.send(
+            f"This server utilizes the **{ctx.prefix}wild** command to "
+            "report wild spawns! When you use it, I will send a message "
+            "summarizing the report and containing a link to my best "
+            "guess of the spawn location. If the reported Pokemon has "
+            "an associated role on the server, I will @mention the role "
+            "in my message! Your report must contain the name of the "
+            "Pokemon followed by its location. "
+            "Try reporting a wild spawn!\n"
+            f"Ex: `{ctx.prefix}wild magikarp some park`")
+
+        try:
+            await self.wait_for_cmd(ctx.tutorial_channel, ctx.author, 'wild')
+
+            # acknowledge and wait a second before continuing
+            await ctx.tutorial_channel.send("Great job!")
+            await asyncio.sleep(1)
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await ctx.tutorial_channel.send(
+                f"You took too long to complete the **{ctx.prefix}wild** "
+                "command! This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+            await ctx.tutorial_channel.delete()
+            return False
+
+        # clean up by removing tutorial from report channel config
+        finally:
+            del report_channels[ctx.tutorial_channel.id]
+
+        return True
+
+    async def raid_tutorial(self, ctx, config):
+        report_channels = config['raid']['report_channels']
+        category_dict = config['raid']['category_dict']
+        tutorial_channel = ctx.tutorial_channel
+        prefix = ctx.prefix
+        raid_channel = None
+
+        # add tutorial channel to valid want report channels
+        report_channels[tutorial_channel.id] = 'test'
+
+        if config['raid']['categories'] == "region":
+            category_dict[tutorial_channel.id] = tutorial_channel.category_id
+
+        async def timeout_raid(cmd):
+            await tutorial_channel.send(
+                f"You took too long to complete the **{prefix}{cmd}** "
+                "command! This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+            await tutorial_channel.delete()
+            del report_channels[tutorial_channel.id]
+            del category_dict[tutorial_channel.id]
+            if raid_channel:
+                await raid_channel.delete()
+                ctx.bot.loop.create_task(self.bot.expire_channel(raid_channel))
+            return
+
+        await tutorial_channel.send(
+            f"This server utilizes the **{prefix}raid** command to "
+            "report raids! When you use it, I will send a message "
+            "summarizing the report and create a text channel for "
+            "coordination. \n"
+            "The report must contain, in this order: The Pokemon (if an "
+            "active raid) or raid level (if an egg), and the location;\n"
+            "the report may optionally contain the weather (see "
+            f"**{prefix}help weather** for accepted options) and the "
+            "minutes remaining until hatch or expiry (at the end of the "
+            "report) \n\n"
+            "Try reporting a raid!\n"
+            f"Ex: `{prefix}raid magikarp local church cloudy 42`\n"
+            f"`{prefix}raid 3 local church sunny 27`")
+
+        try:
+            while True:
+                raid_ctx = await self.wait_for_cmd(
+                    tutorial_channel, ctx.author, 'raid')
+
+                # get the generated raid channel
+                raid_channel = raid_ctx.raid_channel
+
+                if raid_channel:
+                    break
+
+                # acknowledge failure and redo wait_for
+                await tutorial_channel.send(
+                    "Doesn't look like it worked. Make sure you're not "
+                    "missing any arguments from your raid command and "
+                    "try again.")
+
+            # acknowledge and redirect to new raid channel
+            await tutorial_channel.send(
+                "Great job! Let's head into the new raid channel you just "
+                f"created: {raid_channel.mention}")
+            await asyncio.sleep(1)
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await timeout_raid('raid')
+            return False
+
+        # post raid help info prefix, avatar, user
+        helpembed = await utils.get_raid_help(
+            ctx.prefix, ctx.bot.user.avatar_url)
+
+        await raid_channel.send(
+            f"This is an example of a raid channel. Here is a list of "
+            "commands that can be used in here:", embed=helpembed)
+
+        await raid_channel.send(
+            f"Try expressing interest in this raid!\n\n"
+            f"Ex: `{prefix}interested 5 m3 i1 v1` would mean 5 trainers: "
+            "3 Mystic, 1 Instinct, 1 Valor")
+
+        # wait for interested status update
+        try:
+            await self.wait_for_cmd(
+                raid_channel, ctx.author, 'interested')
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await timeout_raid('interested')
+            return False
+
+        # acknowledge and continue with pauses between
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            f"Great job! To save time, you can also use **{prefix}i** "
+            f"as an alias for **{prefix}interested**.")
+
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            "Now try letting people know that you are on your way!\n\n"
+            f"Ex: `{prefix}coming`")
+
+        # wait for coming status update
+        try:
+            await self.wait_for_cmd(
+                raid_channel, ctx.author, 'coming')
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await timeout_raid('coming')
+            return False
+
+        # acknowledge and continue with pauses between
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            "Great! Note that if you have already specified your party "
+            "in a previous command, you do not have to again for the "
+            "current raid unless you are changing it. Also, "
+            f"**{prefix}c** is an alias for **{prefix}coming**.")
+
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            "Now try letting people know that you have arrived at the "
+            "raid!\n\n"
+            f"Ex: `{prefix}here`")
+
+        # wait for here status update
+        try:
+            await self.wait_for_cmd(
+                raid_channel, ctx.author, 'here')
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await timeout_raid('here')
+            return False
+
+        # acknowledge and continue with pauses between
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            f"Good! Please note that **{prefix}h** is an alias for "
+            f"**{prefix}here**")
+
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            "Now try checking to see everyone's RSVP status for this "
+            f"raid!\n\nEx: `{prefix}list`")
+
+        # wait for list command completion
+        try:
+            await self.wait_for_cmd(
+                raid_channel, ctx.author, 'list')
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await timeout_raid('list')
+            return False
+
+        # acknowledge and continue with pauses between
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            "Awesome! Since no one else is on their way, try using the "
+            f"**{prefix}starting** command to move everyone on the "
+            "'here' list to a lobby!")
+
+        # wait for starting command completion
+        try:
+            await self.wait_for_cmd(
+                raid_channel, ctx.author, 'starting')
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await timeout_raid('starting')
+            return False
+
+        # acknowledge and continue with pauses between
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            f"Great! You are now listed as being 'in the lobby', where "
+            "you will remain for two minutes until the raid begins. In "
+            "that time, anyone can request a backout with the "
+            f"**{prefix}backout** command. If the person requesting is "
+            "in the lobby, the backout is automatic. If it is someone "
+            "who arrived at the raid afterward, confirmation will be "
+            "requested from a lobby member. When a backout is confirmed, "
+            "all members will be returned to the 'here' list.")
+
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            "A couple of notes about raid channels. Meowth has "
+            "partnered with Pokebattler to give you the best counters "
+            "for each raid boss in every situation. You can set the "
+            "weather in the initial raid report, or with the "
+            f"**{prefix}weather** command. You can select the moveset "
+            "using the reactions in the initial counters message. If "
+            f"you have a Pokebattler account, you can use **{prefix}set "
+            "pokebattler <id>** to link them! After that, the "
+            f"**{prefix}counters**  command will DM you your own counters "
+            "pulled from your Pokebox.")
+
+        await asyncio.sleep(1)
+        await raid_channel.send(
+            "Last thing: if you need to update the expiry time, use "
+            f"**{prefix}timerset <minutes left>**\n\n"
+            "Feel free to play around with the commands here for a while. "
+            f"When you're finished, type `{prefix}timerset 0` and the "
+            "raid will expire.")
+
+        # wait for timerset command completion
+        try:
+            await self.wait_for_cmd(
+                raid_channel, ctx.author, 'timerset')
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await timeout_raid('timerset')
+            return False
+
+        # acknowledge and direct member back to tutorial channel
+        await raid_channel.send(
+            f"Great! Now return to {tutorial_channel.mention} to "
+            "continue the tutorial. This channel will be deleted in "
+            "ten seconds.")
+
+        await tutorial_channel.send(
+            f"Hey {ctx.author.mention}, once I'm done cleaning up the "
+            "raid channel, the tutorial will continue here!")
+
+        await asyncio.sleep(10)
+
+        # remove tutorial raid channel
+        await raid_channel.delete()
+        raid_channel = None
+        del report_channels[tutorial_channel.id]
+
+        return True
+
+    async def research_tutorial(self, ctx, config):
+        report_channels = config['research']['report_channels']
+        report_channels[ctx.tutorial_channel.id] = 'test'
+
+        await ctx.tutorial_channel.send(
+            f"This server utilizes the **{ctx.prefix}research** command to "
+            "report field research tasks! There are two ways to use this "
+            f"command: **{ctx.prefix}research** will start an interactive "
+            "session where I will prompt you for the task, location, and "
+            "reward of the research task. You can also use "
+            f"**{ctx.prefix}research <pokestop>, <task>, <reward>** to "
+            "submit the report all at once.\n\n"
+            f"Try it out by typing `{ctx.prefix}research`")
+
+        # wait for research command completion
+        try:
+            await self.wait_for_cmd(
+                ctx.tutorial_channel, ctx.author, 'research')
+
+            # acknowledge and wait a second before continuing
+            await ctx.tutorial_channel.send("Great job!")
+            await asyncio.sleep(1)
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await ctx.tutorial_channel.send(
+                f"You took too long to use the **{ctx.prefix}research** "
+                "command! This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+            await ctx.tutorial_channel.delete()
+            return False
+
+        # clean up by removing tutorial from report channel config
+        finally:
+            del report_channels[ctx.tutorial_channel.id]
+
+        return True
+
+    async def team_tutorial(self, ctx):
+        await ctx.tutorial_channel.send(
+            f"This server utilizes the **{ctx.prefix}team** command to "
+            "allow members to select which Pokemon Go team they belong "
+            f"to! Type `{ctx.prefix}team mystic` for example if you are in "
+            "Team Mystic.")
+
+        # wait for team command completion
+        try:
+            await self.wait_for_cmd(
+                ctx.tutorial_channel, ctx.author, 'team')
+
+            # acknowledge and wait a second before continuing
+            await ctx.tutorial_channel.send("Great job!")
+            await asyncio.sleep(1)
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await ctx.tutorial_channel.send(
+                f"You took too long to use the **{ctx.prefix}team** command! "
+                "This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+            await ctx.tutorial_channel.delete()
+            return False
+
+        return True
+
+    async def trade_tutorial(self, ctx, config):
+        report_channels = config['trade']['report_channels']
+        report_channels.append(ctx.tutorial_channel.id)
+
+        await ctx.tutorial_channel.send(
+            f"This server utilizes the **{ctx.prefix}trade** command to "
+            "list your pokemon up for trade. You can list one at a time using "
+            f"command: **{ctx.prefix}trade <pokemon>**. You can also use forms "
+            " of pokemon such as `alolan vulpix`, `unown y`, or `shiny absol`."
+            f"\nEx: `{ctx.prefix}trade unown y`")
+
+        # wait for trade command completion
+        try:
+            trade_msg = await self.wait_for_cmd(
+                ctx.tutorial_channel, ctx.author, 'trade')
+
+            # acknowledge and wait a second before continuing
+            await ctx.tutorial_channel.send("Great job!")
+            await asyncio.sleep(1)
+
+        # if no response for 5 minutes, close tutorial
+        except asyncio.TimeoutError:
+            await ctx.tutorial_channel.send(
+                f"You took too long to use the **{ctx.prefix}research** "
+                "command! This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+            await ctx.tutorial_channel.delete()
+            return False
+
+        # clean up by removing tutorial from report channel config
+        finally:
+            report_channels.remove(ctx.tutorial_channel.id)
+            del ctx.bot.guild_dict[ctx.guild.id]['trade_dict'][trade_msg.channel.id]
+
+        return True
+
+    @commands.group(invoke_without_command=True)
+    async def tutorial(self, ctx):
+        """Launches an interactive tutorial session for Meowth.
+
+        Meowth will create a private channel and initiate a
+        conversation that walks you through the various commands
+        that are enabled on the current server."""
+
+        newbie = ctx.author
+        guild = ctx.guild
+        prefix = ctx.prefix
+
+        # get channel overwrites
+        ows = self.get_overwrites(guild, newbie)
+
+        # create tutorial channel
+        name = utils.sanitize_channel_name(newbie.display_name+"-tutorial")
+        ctx.tutorial_channel = await guild.create_text_channel(
+            name, overwrites=ows)
+        await ctx.message.delete()
+        await ctx.send(
+            ("Meowth! I've created a private tutorial channel for "
+             f"you! Continue in {ctx.tutorial_channel.mention}"),
+            delete_after=20.0)
+
+        # get tutorial settings
+        cfg = self.bot.guild_dict[guild.id]['configure_dict']
+        enabled = [k for k, v in cfg.items() if v.get('enabled', False)]
+
+        await ctx.tutorial_channel.send(
+            f"Hi {ctx.author.mention}! I'm Meowth, a Discord helper bot for "
+            "Pokemon Go communities! I created this channel to teach you "
+            "about the want command! You can abandon this tutorial at any time "
+            "and I'll delete this channel after five minutes. "
+            "Let's get started!\n\n"
+            "Just so you know, across all of Meowth, **<> denote required arguments"
+            ", [] denote optional arguments** and you don't type the <>s or []s.")
+
+        try:
+
+            # start want tutorial
+            if 'want' in enabled:
+                completed = await self.want_tutorial(ctx, cfg)
+                if not completed:
+                    return
+
+            # start wild tutorial
+            if 'wild' in enabled:
+                completed = await self.wild_tutorial(ctx, cfg)
+                if not completed:
+                    return
+
+            # start raid
+            if 'raid' in enabled:
+                completed = await self.raid_tutorial(ctx, cfg)
+                if not completed:
+                    return
+
+            # start exraid
+            if 'exraid' in enabled:
+                invitestr = ""
+
+                if 'invite' in enabled:
+                    invitestr = (
+                        "The text channels that are created with this command "
+                        f"are read-only until members use the **{prefix}invite** "
+                        "command.")
+
+                await ctx.tutorial_channel.send(
+                    f"This server utilizes the **{prefix}exraid** command to "
+                    "report EX raids! When you use it, I will send a message "
+                    "summarizing the report and create a text channel for "
+                    f"coordination. {invitestr}\n"
+                    "The report must contain only the location of the EX raid.\n\n"
+                    "Due to the longer-term nature of EX raid channels, we won't "
+                    "try this command out right now.")
+
+            # start research
+            if 'research' in enabled:
+                completed = await self.research_tutorial(ctx, cfg)
+                if not completed:
+                    return
+
+            # start trade
+            if 'trade' in enabled:
+                completed = await self.trade_tutorial(ctx, cfg)
+                if not completed:
+                    return
+
+            # start team
+            if 'team' in enabled:
+                completed = await self.team_tutorial(ctx)
+                if not completed:
+                    return
+
+            # finish tutorial
+            await ctx.tutorial_channel.send(
+                f"This concludes the Meowth tutorial! "
+                "This channel will be deleted in 30 seconds.")
+            await asyncio.sleep(30)
+
+        finally:
+            await ctx.tutorial_channel.delete()
+
+    @tutorial.command()
+    @checks.feature_enabled('want')
+    async def want(self, ctx):
+        """Launches an tutorial session for the want feature.
+
+        Meowth will create a private channel and initiate a
+        conversation that walks you through the various commands
+        that are enabled on the current server."""
+
+        newbie = ctx.author
+        guild = ctx.guild
+
+        # get channel overwrites
+        ows = self.get_overwrites(guild, newbie)
+
+        # create tutorial channel
+        name = utils.sanitize_channel_name(newbie.display_name+"-tutorial")
+        ctx.tutorial_channel = await guild.create_text_channel(
+            name, overwrites=ows)
+        await ctx.message.delete()
+        await ctx.send(
+            ("Meowth! I've created a private tutorial channel for "
+             f"you! Continue in {ctx.tutorial_channel.mention}"),
+            delete_after=20.0)
+
+        # get tutorial settings
+        cfg = self.bot.guild_dict[guild.id]['configure_dict']
+
+        await ctx.tutorial_channel.send(
+            f"Hi {ctx.author.mention}! I'm Meowth, a Discord helper bot for "
+            "Pokemon Go communities! I created this channel to teach you "
+            "about the want command! You can abandon this tutorial at any time "
+            "and I'll delete this channel after five minutes. "
+            "Let's get started!\n\n"
+            "Just so you know, across all of Meowth, **<> denote required arguments"
+            ", [] denote optional arguments** and you don't type the <>s or []s.")
+
+        try:
+            await self.want_tutorial(ctx, cfg)
+            await ctx.tutorial_channel.send(
+                f"This concludes the Meowth tutorial! "
+                "This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+        finally:
+            await ctx.tutorial_channel.delete()
+
+    @tutorial.command()
+    @checks.feature_enabled('wild')
+    async def wild(self, ctx):
+        """Launches an tutorial session for the wild feature.
+
+        Meowth will create a private channel and initiate a
+        conversation that walks you through wild command."""
+
+        newbie = ctx.author
+        guild = ctx.guild
+
+        # get channel overwrites
+        ows = self.get_overwrites(guild, newbie)
+
+        # create tutorial channel
+        name = utils.sanitize_channel_name(newbie.display_name+"-tutorial")
+        ctx.tutorial_channel = await guild.create_text_channel(
+            name, overwrites=ows)
+        await ctx.message.delete()
+        await ctx.send(
+            ("Meowth! I've created a private tutorial channel for "
+             f"you! Continue in {ctx.tutorial_channel.mention}"),
+            delete_after=20.0)
+
+        # get tutorial settings
+        cfg = self.bot.guild_dict[guild.id]['configure_dict']
+
+        await ctx.tutorial_channel.send(
+            f"Hi {ctx.author.mention}! I'm Meowth, a Discord helper bot for "
+            "Pokemon Go communities! I created this channel to teach you "
+            "about the want command! You can abandon this tutorial at any time "
+            "and I'll delete this channel after five minutes. "
+            "Let's get started!\n\n"
+            "Just so you know, across all of Meowth, **<> denote required arguments"
+            ", [] denote optional arguments** and you don't type the <>s or []s.")
+
+        try:
+            await self.wild_tutorial(ctx, cfg)
+            await ctx.tutorial_channel.send(
+                f"This concludes the Meowth tutorial! "
+                "This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+        finally:
+            await ctx.tutorial_channel.delete()
+
+    @tutorial.command()
+    @checks.feature_enabled('raid')
+    async def raid(self, ctx):
+        """Launches an tutorial session for the raid feature.
+
+        Meowth will create a private channel and initiate a
+        conversation that walks you through the raid commands."""
+
+        newbie = ctx.author
+        guild = ctx.guild
+
+        # get channel overwrites
+        ows = self.get_overwrites(guild, newbie)
+
+        # create tutorial channel
+        name = utils.sanitize_channel_name(newbie.display_name+"-tutorial")
+        ctx.tutorial_channel = await guild.create_text_channel(
+            name, overwrites=ows)
+        await ctx.message.delete()
+        await ctx.send(
+            ("Meowth! I've created a private tutorial channel for "
+             f"you! Continue in {ctx.tutorial_channel.mention}"),
+            delete_after=20.0)
+
+        # get tutorial settings
+        cfg = self.bot.guild_dict[guild.id]['configure_dict']
+
+        await ctx.tutorial_channel.send(
+            f"Hi {ctx.author.mention}! I'm Meowth, a Discord helper bot for "
+            "Pokemon Go communities! I created this channel to teach you "
+            "about the want command! You can abandon this tutorial at any time "
+            "and I'll delete this channel after five minutes. "
+            "Let's get started!\n\n"
+            "Just so you know, across all of Meowth, **<> denote required arguments"
+            ", [] denote optional arguments** and you don't type the <>s or []s.")
+
+        try:
+            await self.raid_tutorial(ctx, cfg)
+            await ctx.tutorial_channel.send(
+                f"This concludes the Meowth tutorial! "
+                "This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+        finally:
+            await ctx.tutorial_channel.delete()
+
+    @tutorial.command()
+    @checks.feature_enabled('research')
+    async def research(self, ctx):
+        """Launches an tutorial session for the research feature.
+
+        Meowth will create a private channel and initiate a
+        conversation that walks you through the research command."""
+
+        newbie = ctx.author
+        guild = ctx.guild
+
+        # get channel overwrites
+        ows = self.get_overwrites(guild, newbie)
+
+        # create tutorial channel
+        name = utils.sanitize_channel_name(newbie.display_name+"-tutorial")
+        ctx.tutorial_channel = await guild.create_text_channel(
+            name, overwrites=ows)
+        await ctx.message.delete()
+        await ctx.send(
+            ("Meowth! I've created a private tutorial channel for "
+             f"you! Continue in {ctx.tutorial_channel.mention}"),
+            delete_after=20.0)
+
+        # get tutorial settings
+        cfg = self.bot.guild_dict[guild.id]['configure_dict']
+
+        await ctx.tutorial_channel.send(
+            f"Hi {ctx.author.mention}! I'm Meowth, a Discord helper bot for "
+            "Pokemon Go communities! I created this channel to teach you "
+            "about the want command! You can abandon this tutorial at any time "
+            "and I'll delete this channel after five minutes. "
+            "Let's get started!\n\n"
+            "Just so you know, across all of Meowth, **<> denote required arguments"
+            ", [] denote optional arguments** and you don't type the <>s or []s.")
+
+        try:
+            await self.research_tutorial(ctx, cfg)
+            await ctx.tutorial_channel.send(
+                f"This concludes the Meowth tutorial! "
+                "This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+        finally:
+            await ctx.tutorial_channel.delete()
+
+    @tutorial.command()
+    @checks.feature_enabled('trade')
+    async def trade(self, ctx):
+        """Launches an tutorial session for the research feature.
+
+        Meowth will create a private channel and initiate a
+        conversation that walks you through the research command."""
+
+        newbie = ctx.author
+        guild = ctx.guild
+
+        # get channel overwrites
+        ows = self.get_overwrites(guild, newbie)
+
+        # create tutorial channel
+        name = utils.sanitize_channel_name(newbie.display_name+"-tutorial")
+        ctx.tutorial_channel = await guild.create_text_channel(
+            name, overwrites=ows)
+        await ctx.message.delete()
+        await ctx.send(
+            ("Meowth! I've created a private tutorial channel for "
+             f"you! Continue in {ctx.tutorial_channel.mention}"),
+            delete_after=20.0)
+
+        # get tutorial settings
+        cfg = self.bot.guild_dict[guild.id]['configure_dict']
+
+        await ctx.tutorial_channel.send(
+            f"Hi {ctx.author.mention}! I'm Meowth, a Discord helper bot for "
+            "Pokemon Go communities! I created this channel to teach you "
+            "about the want command! You can abandon this tutorial at any time "
+            "and I'll delete this channel after five minutes. "
+            "Let's get started!\n\n"
+            "Just so you know, across all of Meowth, **<> denote required arguments"
+            ", [] denote optional arguments** and you don't type the <>s or []s.")
+
+        try:
+            await self.trade_tutorial(ctx, cfg)
+            await ctx.tutorial_channel.send(
+                f"This concludes the Meowth tutorial! "
+                "This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+        finally:
+            await ctx.tutorial_channel.delete()
+
+    @tutorial.command()
+    @checks.feature_enabled('team')
+    async def team(self, ctx):
+        """Launches an tutorial session for the team feature.
+
+        Meowth will create a private channel and initiate a
+        conversation that walks you through the team command."""
+
+        newbie = ctx.author
+        guild = ctx.guild
+
+        # get channel overwrites
+        ows = self.get_overwrites(guild, newbie)
+
+        # create tutorial channel
+        name = utils.sanitize_channel_name(newbie.display_name+"-tutorial")
+        ctx.tutorial_channel = await guild.create_text_channel(
+            name, overwrites=ows)
+        await ctx.message.delete()
+        await ctx.send(
+            ("Meowth! I've created a private tutorial channel for "
+             f"you! Continue in {ctx.tutorial_channel.mention}"),
+            delete_after=20.0)
+
+        await ctx.tutorial_channel.send(
+            f"Hi {ctx.author.mention}! I'm Meowth, a Discord helper bot for "
+            "Pokemon Go communities! I created this channel to teach you "
+            "about the want command! You can abandon this tutorial at any time "
+            "and I'll delete this channel after five minutes. "
+            "Let's get started!\n\n"
+            "Just so you know, across all of Meowth, **<> denote required arguments"
+            ", [] denote optional arguments** and you don't type the <>s or []s.")
+
+        try:
+            await self.team_tutorial(ctx)
+            await ctx.tutorial_channel.send(
+                f"This concludes the Meowth tutorial! "
+                "This channel will be deleted in ten seconds.")
+            await asyncio.sleep(10)
+        finally:
+            await ctx.tutorial_channel.delete()
+
+def setup(bot):
+    bot.add_cog(Tutorial(bot))
diff --git a/meowth/exts/utilities.py b/meowth/exts/utilities.py
new file mode 100644
index 000000000..b06225653
--- /dev/null
+++ b/meowth/exts/utilities.py
@@ -0,0 +1,23 @@
+from discord.ext import commands
+
+from meowth import checks
+
+class Utilities:
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.command(name='embed')
+    @checks.serverowner_or_permissions(manage_message=True)
+    async def _embed(self, ctx, title, content=None, colour=None,
+                     icon_url=None, image_url=None, thumbnail_url=None,
+                     plain_msg=''):
+        """Build and post an embed in the current channel.
+
+        Note: Always use quotes to contain multiple words within one argument.
+        """
+        await ctx.embed(title=title, description=content, colour=colour,
+                        icon=icon_url, image=image_url,
+                        thumbnail=thumbnail_url, plain_msg=plain_msg)
+
+def setup(bot):
+    bot.add_cog(Utilities(bot))
diff --git a/meowth/pkmn_match.py b/meowth/pkmn_match.py
index 619d07e1f..4313f25d6 100644
--- a/meowth/pkmn_match.py
+++ b/meowth/pkmn_match.py
@@ -8,7 +8,7 @@ def set_list(word_list):
     WORDS = word_list
 
 def get_pkmn(word):
-    result = process.extractOne(word, WORDS, scorer=fuzz.ratio, score_cutoff = 50)
+    result = process.extractOne(word, WORDS, scorer=fuzz.ratio, score_cutoff = 60)
     if result is None:
         index = None
     else:
diff --git a/meowth/settings.py b/meowth/settings.py
new file mode 100644
index 000000000..bdcd8e26d
--- /dev/null
+++ b/meowth/settings.py
@@ -0,0 +1,86 @@
+class GuildConfig:
+    def __init__(self, data):
+        self._data = data
+        self.prefix = self.settings['prefix']
+        self.offset = self.settings['offset']
+        self.regional_pkmn = self.settings['regional']
+        self.has_configured = self.settings['done']
+
+    @property
+    def settings(self):
+        return self._data['prefix']
+
+class RaidData:
+    def __init__(self, data):
+        self._data = data
+
+class WildData:
+    def __init__(self, data):
+        self._data = data
+
+class QuestData:
+    def __init__(self, data):
+        self._data = data
+
+class EventData:
+    def __init__(self, data):
+        self._data = data
+
+class TrainerData:
+    def __init__(self, bot, data):
+        self._bot = bot
+        self._data = data
+        self.raid_reports = data.get('raid_reports')
+        self.ex_reports = data.get('ex_reports')
+        self.wild_reports = data.get('wild_reports')
+        self.egg_reports = data.get('egg_reports')
+        self.research_reports = data.get('research_reports')
+        self.silph_id = data.get('silphid')
+        self.silph = self.silph_profile
+
+    @property
+    def silph_card(self):
+        if not self.silph_id:
+            return None
+        silph_cog = self._bot.cogs.get('Silph')
+        if not silph_cog:
+            return None
+        return silph_cog.get_silph_card(self.silph_id)
+
+    @property
+    def silph_profile(self):
+        if not self.silph_id:
+            return None
+        silph_cog = self._bot.cogs.get('Silph')
+        if not silph_cog:
+            return None
+        return silph_cog.get_silph_profile_lazy(self.silph_id)
+
+class GuildData:
+    def __init__(self, ctx, data):
+        self.ctx = ctx
+        self._data = data
+
+    @property
+    def config(self):
+        return GuildConfig(self._data['configure_dict'])
+
+    @property
+    def raids(self):
+        return self._data['raidchannel_dict']
+
+    def raid(self, channel_id=None):
+        channel_id = channel_id or self.ctx.channel.id
+        data = self.raids.get(channel_id)
+        return RaidData(data) if data else None
+
+    @property
+    def trainers(self):
+        return self._data['trainers']
+
+    def trainer(self, member_id=None):
+        member_id = member_id or self.ctx.author.id
+        trainer_data = self.trainers.get(member_id)
+        if not trainer_data:
+            return None
+        return TrainerData(self.ctx.bot, trainer_data)
diff --git a/meowth/utils.py b/meowth/utils.py
new file mode 100644
index 000000000..ee7065f1b
--- /dev/null
+++ b/meowth/utils.py
@@ -0,0 +1,247 @@
+import re
+
+from fuzzywuzzy import fuzz
+from fuzzywuzzy import process
+
+import discord
+import asyncio
+
+def get_match(word_list: list, word: str, score_cutoff: int = 60):
+    """Uses fuzzywuzzy to see if word is close to entries in word_list
+
+    Returns a tuple of (MATCH, SCORE)
+    """
+    result = process.extractOne(
+        word, word_list, scorer=fuzz.ratio, score_cutoff=score_cutoff)
+    if not result:
+        return (None, None)
+    return result
+
+def colour(*args):
+    """Returns a discord Colour object.
+
+    Pass one as an argument to define colour:
+        `int` match colour value.
+        `str` match common colour names.
+        `discord.Guild` bot's guild colour.
+        `None` light grey.
+    """
+    arg = args[0] if args else None
+    if isinstance(arg, int):
+        return discord.Colour(arg)
+    if isinstance(arg, str):
+        colour = arg
+        try:
+            return getattr(discord.Colour, colour)()
+        except AttributeError:
+            return discord.Colour.lighter_grey()
+    if isinstance(arg, discord.Guild):
+        return arg.me.colour
+    else:
+        return discord.Colour.lighter_grey()
+
+def make_embed(msg_type='', title=None, icon=None, content=None,
+               msg_colour=None, guild=None, title_url=None,
+               thumbnail='', image='', fields=None, footer=None,
+               footer_icon=None, inline=False):
+    """Returns a formatted discord embed object.
+
+    Define either a type or a colour.
+    Types are:
+    error, warning, info, success, help.
+    """
+
+    embed_types = {
+        'error':{
+            'icon':'https://i.imgur.com/juhq2uJ.png',
+            'colour':'red'
+        },
+        'warning':{
+            'icon':'https://i.imgur.com/4JuaNt9.png',
+            'colour':'gold'
+        },
+        'info':{
+            'icon':'https://i.imgur.com/wzryVaS.png',
+            'colour':'blue'
+        },
+        'success':{
+            'icon':'https://i.imgur.com/ZTKc3mr.png',
+            'colour':'green'
+        },
+        'help':{
+            'icon':'https://i.imgur.com/kTTIZzR.png',
+            'colour':'blue'
+        }
+    }
+    if msg_type in embed_types.keys():
+        msg_colour = embed_types[msg_type]['colour']
+        icon = embed_types[msg_type]['icon']
+    if guild and not msg_colour:
+        msg_colour = colour(guild)
+    else:
+        if not isinstance(msg_colour, discord.Colour):
+            msg_colour = colour(msg_colour)
+    embed = discord.Embed(description=content, colour=msg_colour)
+    if not title_url:
+        title_url = discord.Embed.Empty
+    if not icon:
+        icon = discord.Embed.Empty
+    if title:
+        embed.set_author(name=title, icon_url=icon, url=title_url)
+    if thumbnail:
+        embed.set_thumbnail(url=thumbnail)
+    if image:
+        embed.set_image(url=image)
+    if fields:
+        for key, value in fields.items():
+            ilf = inline
+            if not isinstance(value, str):
+                ilf = value[0]
+                value = value[1]
+            embed.add_field(name=key, value=value, inline=ilf)
+    if footer:
+        footer = {'text':footer}
+        if footer_icon:
+            footer['icon_url'] = footer_icon
+        embed.set_footer(**footer)
+    return embed
+
+def bold(msg: str):
+    """Format to bold markdown text"""
+    return f'**{msg}**'
+
+def italics(msg: str):
+    """Format to italics markdown text"""
+    return f'*{msg}*'
+
+def bolditalics(msg: str):
+    """Format to bold italics markdown text"""
+    return f'***{msg}***'
+
+def code(msg: str):
+    """Format to markdown code block"""
+    return f'```{msg}```'
+
+def pycode(msg: str):
+    """Format to code block with python code highlighting"""
+    return f'```py\n{msg}```'
+
+def ilcode(msg: str):
+    """Format to inline markdown code"""
+    return f'`{msg}`'
+
+def convert_to_bool(argument):
+    lowered = argument.lower()
+    if lowered in ('yes', 'y', 'true', 't', '1', 'enable', 'on'):
+        return True
+    elif lowered in ('no', 'n', 'false', 'f', '0', 'disable', 'off'):
+        return False
+    else:
+        return None
+
+def sanitize_channel_name(name):
+    """Converts a given string into a compatible discord channel name."""
+    # Remove all characters other than alphanumerics,
+    # dashes, underscores, and spaces
+    ret = re.sub('[^a-zA-Z0-9 _\\-]', '', name)
+    # Replace spaces with dashes
+    ret = ret.replace(' ', '-')
+    return ret
+
+async def get_raid_help(prefix, avatar, user=None):
+    helpembed = discord.Embed(colour=discord.Colour.lighter_grey())
+    helpembed.set_author(name="Raid Coordination Help", icon_url=avatar)
+    helpembed.add_field(
+        name="Key",
+        value="<> denote required arguments, [] denote optional arguments",
+        inline=False)
+    helpembed.add_field(
+        name="Raid MGMT Commands",
+        value=(
+            f"`{prefix}raid <species>`\n"
+            f"`{prefix}weather <weather>`\n"
+            f"`{prefix}timerset <minutes>`\n"
+            f"`{prefix}starttime <time>`\n"
+            "`<google maps link>`\n"
+            "**RSVP**\n"
+            f"`{prefix}i, {prefix}c, {prefix}h, {prefix}x...\n"
+            "[total]...\n"
+            "[team counts]`\n"
+            "**Lists**\n"
+            f"`{prefix}list [status]`\n"
+            f"`{prefix}list [status] tags`\n"
+            f"`{prefix}list teams`\n\n"
+            f"`{prefix}starting [team]`"))
+    helpembed.add_field(
+        name="Description",
+        value=(
+            "`Hatches Egg channel`\n"
+            "`Sets in-game weather`\n"
+            "`Sets hatch/raid timer`\n"
+            "`Sets start time`\n"
+            "`Updates raid location`\n\n"
+            "`interested, coming, here, cancel`\n"
+            "`# of trainers`\n"
+            "`# from each team (ex. 3m for 3 Mystic)`\n\n"
+            "`Lists trainers by status`\n"
+            "`@mentions trainers by status`\n"
+            "`Lists trainers by team`\n\n"
+            "`Moves trainers on 'here' list to a lobby.`"))
+    helpembed.add_field(
+        name="README",
+        value="Visit our [README](https://github.com/doonce/meowth#directions-for-using-meowth) for a full list of commands.",
+        inline=False)
+    if not user:
+        return helpembed
+    await user.send(embed=helpembed)
+
+def get_number(bot, pkm_name):
+    try:
+        number = bot.pkmn_info['pokemon_list'].index(pkm_name) + 1
+    except ValueError:
+        number = None
+    return number
+
+def get_name(bot, pkmn_number):
+    pkmn_number = int(pkmn_number) - 1
+    try:
+        name = bot.pkmn_info['pokemon_list'][pkmn_number]
+    except IndexError:
+        name = None
+    return name
+
+def get_raidlist(bot):
+    raidlist = []
+    for level in bot.raid_info['raid_eggs']:
+        for pokemon in bot.raid_info['raid_eggs'][level]['pokemon']:
+            raidlist.append(pokemon)
+            raidlist.append(get_name(pokemon).lower())
+    return raidlist
+
+def get_level(bot, pkmn):
+    if str(pkmn).isdigit():
+        pkmn_number = pkmn
+    else:
+        pkmn_number = get_number(bot, pkmn)
+    for level in bot.raid_info['raid_eggs']:
+        for level, pkmn_list in bot.raid_info['raid_eggs'].items():
+            if pkmn_number in pkmn_list["pokemon"]:
+                return level
+
+async def ask(bot, message, user_list=None, timeout=60, *, react_list=['✅', '❎']):
+    if user_list and type(user_list) != __builtins__.list:
+        user_list = [user_list]
+    def check(reaction, user):
+        if user_list and type(user_list) is __builtins__.list:
+            return (user.id in user_list) and (reaction.message.id == message.id) and (reaction.emoji in react_list)
+        elif not user_list:
+            return (user.id != message.author.id) and (reaction.message.id == message.id) and (reaction.emoji in react_list)
+    for r in react_list:
+        await asyncio.sleep(0.25)
+        await message.add_reaction(r)
+    try:
+        reaction, user = await bot.wait_for('reaction_add', check=check, timeout=timeout)
+        return reaction, user
+    except asyncio.TimeoutError:
+        await message.clear_reactions()
+        return