diff --git a/CodeGenerator.Designer.cs b/CodeGenerator.Designer.cs
new file mode 100644
index 000000000..acf64bdaf
--- /dev/null
+++ b/CodeGenerator.Designer.cs
@@ -0,0 +1,198 @@
+namespace PKHeX
+{
+    partial class CodeGenerator
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CodeGenerator));
+            this.RTB_Code = new System.Windows.Forms.RichTextBox();
+            this.TB_Write = new System.Windows.Forms.TextBox();
+            this.L_Write = new System.Windows.Forms.Label();
+            this.L_Source = new System.Windows.Forms.Label();
+            this.CB_Source = new System.Windows.Forms.ComboBox();
+            this.B_CnE = new System.Windows.Forms.Button();
+            this.L_Box = new System.Windows.Forms.Label();
+            this.L_Slot = new System.Windows.Forms.Label();
+            this.comboBox2 = new System.Windows.Forms.ComboBox();
+            this.comboBox3 = new System.Windows.Forms.ComboBox();
+            this.L_Info = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // RTB_Code
+            // 
+            this.RTB_Code.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.RTB_Code.Location = new System.Drawing.Point(12, 71);
+            this.RTB_Code.Name = "RTB_Code";
+            this.RTB_Code.ReadOnly = true;
+            this.RTB_Code.Size = new System.Drawing.Size(210, 175);
+            this.RTB_Code.TabIndex = 0;
+            this.RTB_Code.Text = "01234567 01234567 01234567 ";
+            // 
+            // TB_Write
+            // 
+            this.TB_Write.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.TB_Write.Location = new System.Drawing.Point(12, 24);
+            this.TB_Write.Name = "TB_Write";
+            this.TB_Write.Size = new System.Drawing.Size(65, 20);
+            this.TB_Write.TabIndex = 1;
+            this.TB_Write.Text = "01234567";
+            // 
+            // L_Write
+            // 
+            this.L_Write.AutoSize = true;
+            this.L_Write.Location = new System.Drawing.Point(9, 8);
+            this.L_Write.Name = "L_Write";
+            this.L_Write.Size = new System.Drawing.Size(66, 13);
+            this.L_Write.TabIndex = 2;
+            this.L_Write.Text = "Write Offset:";
+            // 
+            // L_Source
+            // 
+            this.L_Source.AutoSize = true;
+            this.L_Source.Location = new System.Drawing.Point(87, 8);
+            this.L_Source.Name = "L_Source";
+            this.L_Source.Size = new System.Drawing.Size(70, 13);
+            this.L_Source.TabIndex = 5;
+            this.L_Source.Text = "Data Source:";
+            // 
+            // CB_Source
+            // 
+            this.CB_Source.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CB_Source.FormattingEnabled = true;
+            this.CB_Source.Items.AddRange(new object[] {
+            "Loaded EKX (Tabs)",
+            "Box EKX ",
+            "Wondercard"});
+            this.CB_Source.Location = new System.Drawing.Point(90, 23);
+            this.CB_Source.Name = "CB_Source";
+            this.CB_Source.Size = new System.Drawing.Size(132, 21);
+            this.CB_Source.TabIndex = 6;
+            // 
+            // B_CnE
+            // 
+            this.B_CnE.Location = new System.Drawing.Point(37, 252);
+            this.B_CnE.Name = "B_CnE";
+            this.B_CnE.Size = new System.Drawing.Size(157, 23);
+            this.B_CnE.TabIndex = 9;
+            this.B_CnE.Text = "Create && Export Code File";
+            this.B_CnE.UseVisualStyleBackColor = true;
+            // 
+            // L_Box
+            // 
+            this.L_Box.AutoSize = true;
+            this.L_Box.Location = new System.Drawing.Point(87, 48);
+            this.L_Box.Name = "L_Box";
+            this.L_Box.Size = new System.Drawing.Size(28, 13);
+            this.L_Box.TabIndex = 10;
+            this.L_Box.Text = "Box:";
+            // 
+            // L_Slot
+            // 
+            this.L_Slot.AutoSize = true;
+            this.L_Slot.Location = new System.Drawing.Point(156, 48);
+            this.L_Slot.Name = "L_Slot";
+            this.L_Slot.Size = new System.Drawing.Size(28, 13);
+            this.L_Slot.TabIndex = 11;
+            this.L_Slot.Text = "Slot:";
+            // 
+            // comboBox2
+            // 
+            this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox2.FormattingEnabled = true;
+            this.comboBox2.Items.AddRange(new object[] {
+            "Loaded EKX (Tabs)",
+            "Box EKX ",
+            "Wondercard"});
+            this.comboBox2.Location = new System.Drawing.Point(187, 44);
+            this.comboBox2.Name = "comboBox2";
+            this.comboBox2.Size = new System.Drawing.Size(35, 21);
+            this.comboBox2.TabIndex = 12;
+            // 
+            // comboBox3
+            // 
+            this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox3.FormattingEnabled = true;
+            this.comboBox3.Items.AddRange(new object[] {
+            "Loaded EKX (Tabs)",
+            "Box EKX ",
+            "Wondercard"});
+            this.comboBox3.Location = new System.Drawing.Point(115, 44);
+            this.comboBox3.Name = "comboBox3";
+            this.comboBox3.Size = new System.Drawing.Size(35, 21);
+            this.comboBox3.TabIndex = 13;
+            // 
+            // L_Info
+            // 
+            this.L_Info.AutoSize = true;
+            this.L_Info.Location = new System.Drawing.Point(12, 48);
+            this.L_Info.Name = "L_Info";
+            this.L_Info.Size = new System.Drawing.Size(31, 13);
+            this.L_Info.TabIndex = 14;
+            this.L_Info.Text = "(Info)";
+            // 
+            // CodeGenerator
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(230, 282);
+            this.Controls.Add(this.L_Info);
+            this.Controls.Add(this.comboBox3);
+            this.Controls.Add(this.comboBox2);
+            this.Controls.Add(this.L_Slot);
+            this.Controls.Add(this.L_Box);
+            this.Controls.Add(this.B_CnE);
+            this.Controls.Add(this.CB_Source);
+            this.Controls.Add(this.L_Source);
+            this.Controls.Add(this.L_Write);
+            this.Controls.Add(this.TB_Write);
+            this.Controls.Add(this.RTB_Code);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "CodeGenerator";
+            this.Text = "CodeGenerator";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.RichTextBox RTB_Code;
+        private System.Windows.Forms.TextBox TB_Write;
+        private System.Windows.Forms.Label L_Write;
+        private System.Windows.Forms.Label L_Source;
+        private System.Windows.Forms.ComboBox CB_Source;
+        private System.Windows.Forms.Button B_CnE;
+        private System.Windows.Forms.Label L_Box;
+        private System.Windows.Forms.Label L_Slot;
+        private System.Windows.Forms.ComboBox comboBox2;
+        private System.Windows.Forms.ComboBox comboBox3;
+        private System.Windows.Forms.Label L_Info;
+    }
+}
\ No newline at end of file
diff --git a/CodeGenerator.cs b/CodeGenerator.cs
new file mode 100644
index 000000000..c9a42a836
--- /dev/null
+++ b/CodeGenerator.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace PKHeX
+{
+    public partial class CodeGenerator : Form
+    {
+        public CodeGenerator()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/CodeGenerator.resx b/CodeGenerator.resx
new file mode 100644
index 000000000..49f6fd123
--- /dev/null
+++ b/CodeGenerator.resx
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="RTB_Code.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="TB_Write.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="L_Write.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="L_Source.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CB_Source.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="B_CnE.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="L_Box.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="L_Slot.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="comboBox2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="comboBox3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="L_Info.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAE
+        AAAAAAAAAAAAAAAAAAAAAAAAIyMjAQAAAAALCwsPJiYmJysrKycqKionKSkpJykpKScpKSknKioqJyoq
+        KicrKysnJycnJw0ODQ8AAAAAJiYmAQAAAABpaWlHq6ur17+/v+6+vr7svr6+7b6+vu2+vr7tvr6+7b6+
+        vu2+vr7tvr6+7L+/v+6rq6vXampqSAAAAAAoKSgXvr++3eLi4v/g4OD94eHh/+Hh4f/i4uL/4uLi/+Li
+        4v/i4uL/4eHh/+Dh4P/g4OD94uLi/7+/v90sLCwXfn5+PNna2frg4OD/39/f/uHh4f7h4eH+39/f/uDg
+        4P7g4OD+39/f/uHh4f7h4OH+39/f/t/g3//a2tr6g4ODPoOCgz7X19f64+Pj/+Li4v7k5OT/4+Tj//Ly
+        8v/19fX/9PT0//T09P/k5OT/5OTk/+Pj4/7j4+P/19jX+4qLikCDhIM+2tra++Xl5f/k5eT+5OTk//Lz
+        8v+urq7/RUVF/z4+Pv+Zmpn/8fHx/+Xm5f/k5eT+5eXl/9ra2vyLi4tAhYWFPuXm5vvx8vP/7+/w/v//
+        //+sra3/AgIC/15eXv9tbG3/BQUF/4yMjP//////7+/w/vHy8//l5ub8jY2NQC4uLD5LS0f7UFBL/09P
+        Sv5YWVP/FBUS/29wcP///////////5SUlP8PDw//U1NO/1BQS/5PT0r/S0tH/DIyMEAAAAs+AAAM+wAA
+        Dv8AAA/+AwMS/wAAAP+UlJX///////////+3t7n/AAAA/wAAD/8BAQ/+AAAO/wAADPwCAg5ABARSPgoK
+        k/sNDab/DQ2o/hAQvP8CAmj/IiIW/7Kzrv/Cw8D/NDQm/wAATf8QELz/DQ2q/gwMp/8LC5T8Dg5bQAUF
+        Xj4KCpz7DQ2u/w0NsP4NDbX/Dw+//wUFYf8CAhL/AwMP/wMDTf8ODrj/Dg64/w0NsP4MDK7/Cwud/A8P
+        aEEGBmU9DAyl+w4Otf8ODrf+Dw+6/xAQvv8TE8v/EhK+/xAQvP8TE8v/EBDA/w8Puf8PD7f+Dg61/w0N
+        pvsREW9ACAhtQA8PsfsTE77/ExO//xQUwP8UFML/FBTD/xUVyP8WFsn/FRXE/xQUw/8UFMH/ExO//xMT
+        vv8QELL7ERF3QxkZdCgXF771ExPH/xUVyPwVFcn9FhbL/RcXzP0XF8z9FxfM/RcXy/0XF8v9FhbJ/RUV
+        yPwTE8f/Fxe+9RkZdykAAAAAIyOtghsbx/8ZGcj+GRnJ/xoayf8aGsn/GhrK/xoayv8aGsn/GhrJ/xkZ
+        yf8ZGcj+GxvH/yMjrYQAAAAAAADHAQAAAAAzM51FLCyscCoqrGwqKqxtKSmsbSoqrG0qKqxtKSmsbSoq
+        rG0qKqxsLCyscDMznUUAAAAAAAAAAP//AADAAwAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIAB
+        AACAAQAAgAEAAIABAACAAQAAgAEAAP//AAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKysrCR0dHSMWFhY3GBgYORgYGDkYGBg5GBgYORgY
+        GDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5FxcXNx4e
+        HiQuLi4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhIARYWFis7OzuVkJCQ2ampqeqqqqrsqqqq7Kqq
+        quyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqq
+        quypqanqkZGR2j09PZcXFxcsUFBQAQAAAAAAAAAAAAAAAAAAAAASEhIuhISEytvb2/7W1tb/19fX/9jY
+        2P/Y2Nj/2NjY/9jY2P/Y2Nj/2NjY/9nZ2f/Z2dn/2dnZ/9nZ2f/Z2dn/2dnZ/9nZ2f/Y2Nj/2NjY/9jY
+        2P/Y2Nj/2NjY/9fX1//W1tb/29vb/oeHh8sTExMvAAAAAAAAAAAAAAAAPDw8DGtra6zZ2dn/2dnZ/9ra
+        2v/b29v/29vb/9vb2//c3Nz/3Nzc/9zc3P/c3Nz/3d3d/93d3f/d3d3/3d3d/93d3f/d3d3/3Nzc/9zc
+        3P/c3Nz/3Nzc/9vb2//b29v/29vb/9ra2v/Z2dn/2dnZ/21tba5DQ0MNAAAAAAAAAAAiIiIx1NXU9tna
+        2f/c3Nz/3d3d/93e3f/e3t7/3t7e/9/f3//f39//39/f/9/g3//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/39/f/9/f3//f39//3t/e/97e3v/d3t3/3d3d/9zc3P/Z2tn/1dXV9icnJzMAAAAAAAAAAFhZ
+        WFzf4N//3Nzc/97e3v/f39//39/f/9/g3//g4OD/4ODg/+Hh4f/h4eH/4eHh/+Li4v/i4uL/4uLi/+Li
+        4v/i4uL/4uLi/+Hi4f/h4eH/4eHh/+Dg4P/g4OD/3+Df/9/f3//f39//3t7e/9zc3P/f39//XV1dXQAA
+        AAAAAAAAZmZmZdvc2//e3t7/3+Df/+Dg4P/g4eD/4eHh/+Hi4f/i4uL/4uPi/+Pj4//j4+P/5OTk/+Tk
+        5P/k5OT/5OTk/+Tk5P/k5OT/4+Pj/+Pj4//j4+P/4uLi/+Li4v/h4eH/4eHh/+Dg4P/f4N//3t7e/9vb
+        2/9wcHBoAAAAAAAAAABoaGhl3d3d/9/f3//h4eH/4eLh/+Li4v/j4+P/4+Pj/+Tk5P/k5OT/5eXl/+Xl
+        5f/l5uX/5ubm/+bm5v/m5ub/5ubm/+bm5v/l5eX/5eXl/+Tk5P/k5OT/4+Pj/+Pj4//i4uL/4uLi/+Hh
+        4f/f39//3N3c/3Nzc2kAAAAAAAAAAGhoaGXe3t7/4ODg/+Li4v/j4+P/4+Pj/+Tk5P/l5eX/5eXl/+bm
+        5v/m5+b/5+fn/+fn5//n6Of/6Ojo/+jo6P/o6Oj/5+fn/+fn5//n5+f/5ubm/+Xl5f/l5eX/5OTk/+Pk
+        4//j4+P/4uLi/+Dg4P/e3t7/c3NzaQAAAAAAAAAAaGhoZd/g3//i4uL/5OTk/+Tl5P/l5eX/5ebl/+bn
+        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
+        wf8REcL/EhLC/xISw/8SEsP/EhLC/xERwv8REcH/ERHA/xERvv8QEL3/EBC7/xAQuv8QELj/Dw+3/w8P
+        tf8ODrD/DAyq/xMTZWsAAAAAAAAAAAcHWmUODrD/EBC2/xERuv8REbz/ERG9/xISvv8SEr//EhLA/xMT
+        wf8TE8P/ExPD/xMTxP8TE8X/FBTF/xQUxf8UFMX/ExPE/xMTxP8TE8P/ExPC/xISwf8SEr//EhK+/xER
+        vf8REbz/ERG6/xAQtv8ODrD/FBRpawAAAAAAAAAACAhcYxAQtf8SErv/ExO+/xQUwP8UFMD/FBTB/xUV
+        wv8VFcP/FRXE/xUVxf8WFsb/FhbG/xYWx/8WFsf/FhbH/xYWx/8WFsf/FhbG/xYWxf8VFcT/FRXD/xUV
+        wv8UFMH/FBTB/xQUwP8TE77/EhK7/xAQtf8TE2hoAAAAAAAAAAAQEFNUFRXC/xMTv/8UFMP/FRXE/xUV
+        xP8VFcX/FRXG/xYWx/8WFsf/FhbI/xYWyf8XF8n/FxfK/xcXyv8XF8r/FxfK/xcXyf8XF8n/FhbI/xYW
+        yP8WFsf/FhbG/xUVxf8VFcT/FRXE/xQUw/8TE7//FRXB/xAQV1UAAAAAAAAAAA0NPxkjI8byFBTD/xUV
+        x/8WFsj/FxfJ/xcXyf8XF8r/FxfK/xcXy/8YGMz/GBjM/xgYzP8YGM3/GBjN/xgYzf8YGM3/GBjM/xgY
+        zP8YGMz/GBjL/xcXy/8XF8r/FxfJ/xcXyf8WFsj/FRXH/xQUw/8jI8f0Dg5GGwAAAAAAAAAAFhZxAiUl
+        eIUZGcr/FBTI/xUVyv8WFsv/FhbM/xYWzP8WFsz/FhbN/xcXzf8XF83/FxfN/xcXzv8XF87/FxfO/xcX
+        zv8XF87/FxfN/xcXzf8WFs3/FhbM/xYWzP8WFsz/FhbL/xUVyv8UFMj/GBjJ/yYmeogWFnYCAAAAAAAA
+        AAAAAAAAGBh1BzMzk50kJNP+FxfK/xgYzP8YGMz/GBjN/xgYzf8YGM3/GBjN/xgYzf8ZGc7/GRnO/xkZ
+        zv8ZGc7/GRnO/xkZzv8YGM3/GBjN/xgYzf8YGM3/GBjN/xgYzP8YGMz/FxfK/yMj0v4zM5WfFBRkBwAA
+        AAAAAAAAAAAAAAAAAAAAAAAAHBx7Ay0tdkg3N5emMTGpxSwsp8gsLKfILCynyCwsp8gsLKfILCynyCws
+        p8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyDExqcU2NpenLi54Shsb
+        ewMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////8AAAD+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AA
+        AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
+        AAPAAAADwAAAA8AAAAPAAAAD4AAAB/gAAB//////
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PKHeX.csproj b/PKHeX.csproj
index 0df2c8f54..b455dccdf 100644
--- a/PKHeX.csproj
+++ b/PKHeX.csproj
@@ -244,7 +244,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="favicon.ico" />
     <Content Include="icon.ico" />
     <None Include="Resources\text\de\lang_de.txt" />
     <None Include="Resources\text\fr\lang_fr.txt" />
diff --git a/SAV_BerryField.Designer.cs b/SAV_BerryField.Designer.cs
index d35b2088b..b6bf5ade1 100644
--- a/SAV_BerryField.Designer.cs
+++ b/SAV_BerryField.Designer.cs
@@ -34,8 +34,22 @@
             this.label2 = new System.Windows.Forms.Label();
             this.B_Cancel = new System.Windows.Forms.Button();
             this.B_Save = new System.Windows.Forms.Button();
-            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.TB_Berry = new System.Windows.Forms.TextBox();
+            this.L_Berry = new System.Windows.Forms.Label();
+            this.L_u1 = new System.Windows.Forms.Label();
+            this.L_u2 = new System.Windows.Forms.Label();
+            this.L_u3 = new System.Windows.Forms.Label();
+            this.TB_u1 = new System.Windows.Forms.TextBox();
+            this.TB_u2 = new System.Windows.Forms.TextBox();
+            this.TB_u3 = new System.Windows.Forms.TextBox();
+            this.TB_u7 = new System.Windows.Forms.TextBox();
+            this.TB_u6 = new System.Windows.Forms.TextBox();
+            this.TB_u5 = new System.Windows.Forms.TextBox();
             this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.TB_u4 = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // listBox1
@@ -80,14 +94,14 @@
             "36"});
             this.listBox1.Location = new System.Drawing.Point(12, 25);
             this.listBox1.Name = "listBox1";
-            this.listBox1.Size = new System.Drawing.Size(38, 160);
+            this.listBox1.Size = new System.Drawing.Size(38, 472);
             this.listBox1.TabIndex = 0;
             this.listBox1.SelectedIndexChanged += new System.EventHandler(this.changefield);
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(59, 95);
+            this.label1.Location = new System.Drawing.Point(67, 458);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(173, 13);
             this.label1.TabIndex = 1;
@@ -104,7 +118,7 @@
             // 
             // B_Cancel
             // 
-            this.B_Cancel.Location = new System.Drawing.Point(70, 162);
+            this.B_Cancel.Location = new System.Drawing.Point(81, 474);
             this.B_Cancel.Name = "B_Cancel";
             this.B_Cancel.Size = new System.Drawing.Size(75, 23);
             this.B_Cancel.TabIndex = 3;
@@ -115,37 +129,170 @@
             // B_Save
             // 
             this.B_Save.Enabled = false;
-            this.B_Save.Location = new System.Drawing.Point(157, 162);
+            this.B_Save.Location = new System.Drawing.Point(168, 474);
             this.B_Save.Name = "B_Save";
             this.B_Save.Size = new System.Drawing.Size(75, 23);
             this.B_Save.TabIndex = 4;
             this.B_Save.Text = "Save";
             this.B_Save.UseVisualStyleBackColor = true;
             // 
-            // textBox1
+            // TB_Berry
             // 
-            this.textBox1.Location = new System.Drawing.Point(113, 25);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.ReadOnly = true;
-            this.textBox1.Size = new System.Drawing.Size(100, 20);
-            this.textBox1.TabIndex = 5;
+            this.TB_Berry.Location = new System.Drawing.Point(98, 12);
+            this.TB_Berry.Name = "TB_Berry";
+            this.TB_Berry.ReadOnly = true;
+            this.TB_Berry.Size = new System.Drawing.Size(100, 20);
+            this.TB_Berry.TabIndex = 5;
+            // 
+            // L_Berry
+            // 
+            this.L_Berry.AutoSize = true;
+            this.L_Berry.Location = new System.Drawing.Point(58, 15);
+            this.L_Berry.Name = "L_Berry";
+            this.L_Berry.Size = new System.Drawing.Size(34, 13);
+            this.L_Berry.TabIndex = 6;
+            this.L_Berry.Text = "Berry:";
+            // 
+            // L_u1
+            // 
+            this.L_u1.AutoSize = true;
+            this.L_u1.Location = new System.Drawing.Point(58, 41);
+            this.L_u1.Name = "L_u1";
+            this.L_u1.Size = new System.Drawing.Size(13, 13);
+            this.L_u1.TabIndex = 7;
+            this.L_u1.Text = "1";
+            // 
+            // L_u2
+            // 
+            this.L_u2.AutoSize = true;
+            this.L_u2.Location = new System.Drawing.Point(58, 67);
+            this.L_u2.Name = "L_u2";
+            this.L_u2.Size = new System.Drawing.Size(13, 13);
+            this.L_u2.TabIndex = 8;
+            this.L_u2.Text = "2";
+            // 
+            // L_u3
+            // 
+            this.L_u3.AutoSize = true;
+            this.L_u3.Location = new System.Drawing.Point(58, 93);
+            this.L_u3.Name = "L_u3";
+            this.L_u3.Size = new System.Drawing.Size(13, 13);
+            this.L_u3.TabIndex = 9;
+            this.L_u3.Text = "3";
+            // 
+            // TB_u1
+            // 
+            this.TB_u1.Location = new System.Drawing.Point(99, 38);
+            this.TB_u1.Name = "TB_u1";
+            this.TB_u1.ReadOnly = true;
+            this.TB_u1.Size = new System.Drawing.Size(100, 20);
+            this.TB_u1.TabIndex = 12;
+            // 
+            // TB_u2
+            // 
+            this.TB_u2.Location = new System.Drawing.Point(98, 64);
+            this.TB_u2.Name = "TB_u2";
+            this.TB_u2.ReadOnly = true;
+            this.TB_u2.Size = new System.Drawing.Size(100, 20);
+            this.TB_u2.TabIndex = 13;
+            // 
+            // TB_u3
+            // 
+            this.TB_u3.Location = new System.Drawing.Point(98, 90);
+            this.TB_u3.Name = "TB_u3";
+            this.TB_u3.ReadOnly = true;
+            this.TB_u3.Size = new System.Drawing.Size(100, 20);
+            this.TB_u3.TabIndex = 14;
+            // 
+            // TB_u7
+            // 
+            this.TB_u7.Location = new System.Drawing.Point(98, 194);
+            this.TB_u7.Name = "TB_u7";
+            this.TB_u7.ReadOnly = true;
+            this.TB_u7.Size = new System.Drawing.Size(100, 20);
+            this.TB_u7.TabIndex = 22;
+            // 
+            // TB_u6
+            // 
+            this.TB_u6.Location = new System.Drawing.Point(98, 168);
+            this.TB_u6.Name = "TB_u6";
+            this.TB_u6.ReadOnly = true;
+            this.TB_u6.Size = new System.Drawing.Size(100, 20);
+            this.TB_u6.TabIndex = 21;
+            // 
+            // TB_u5
+            // 
+            this.TB_u5.Location = new System.Drawing.Point(99, 142);
+            this.TB_u5.Name = "TB_u5";
+            this.TB_u5.ReadOnly = true;
+            this.TB_u5.Size = new System.Drawing.Size(100, 20);
+            this.TB_u5.TabIndex = 20;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(73, 28);
+            this.label3.Location = new System.Drawing.Point(58, 197);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(34, 13);
-            this.label3.TabIndex = 6;
-            this.label3.Text = "Berry:";
+            this.label3.Size = new System.Drawing.Size(13, 13);
+            this.label3.TabIndex = 19;
+            this.label3.Text = "7";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(58, 171);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(13, 13);
+            this.label4.TabIndex = 18;
+            this.label4.Text = "6";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(58, 145);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(13, 13);
+            this.label5.TabIndex = 17;
+            this.label5.Text = "5";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(58, 119);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(13, 13);
+            this.label6.TabIndex = 16;
+            this.label6.Text = "4";
+            // 
+            // TB_u4
+            // 
+            this.TB_u4.Location = new System.Drawing.Point(98, 116);
+            this.TB_u4.Name = "TB_u4";
+            this.TB_u4.ReadOnly = true;
+            this.TB_u4.Size = new System.Drawing.Size(100, 20);
+            this.TB_u4.TabIndex = 15;
             // 
             // SAV_BerryField
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(244, 192);
+            this.ClientSize = new System.Drawing.Size(256, 505);
+            this.Controls.Add(this.TB_u7);
+            this.Controls.Add(this.TB_u6);
+            this.Controls.Add(this.TB_u5);
             this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.TB_u4);
+            this.Controls.Add(this.TB_u3);
+            this.Controls.Add(this.TB_u2);
+            this.Controls.Add(this.TB_u1);
+            this.Controls.Add(this.L_u3);
+            this.Controls.Add(this.L_u2);
+            this.Controls.Add(this.L_u1);
+            this.Controls.Add(this.L_Berry);
+            this.Controls.Add(this.TB_Berry);
             this.Controls.Add(this.B_Save);
             this.Controls.Add(this.B_Cancel);
             this.Controls.Add(this.label2);
@@ -170,7 +317,21 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Button B_Cancel;
         private System.Windows.Forms.Button B_Save;
-        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.TextBox TB_Berry;
+        private System.Windows.Forms.Label L_Berry;
+        private System.Windows.Forms.Label L_u1;
+        private System.Windows.Forms.Label L_u2;
+        private System.Windows.Forms.Label L_u3;
+        private System.Windows.Forms.TextBox TB_u1;
+        private System.Windows.Forms.TextBox TB_u2;
+        private System.Windows.Forms.TextBox TB_u3;
+        private System.Windows.Forms.TextBox TB_u7;
+        private System.Windows.Forms.TextBox TB_u6;
+        private System.Windows.Forms.TextBox TB_u5;
         private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox TB_u4;
     }
 }
\ No newline at end of file
diff --git a/SAV_BerryField.cs b/SAV_BerryField.cs
index 1944c2c71..e4b57e77e 100644
--- a/SAV_BerryField.cs
+++ b/SAV_BerryField.cs
@@ -31,8 +31,27 @@ namespace PKHeX
         {
             // Change Berry Field
             int offset = berryfoffset + shiftval;
-            int index = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex*0x18);
-            textBox1.Text = index.ToString();
+
+            // Gather Data
+            int berry = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex*0x18 + 1 * 0);
+            int u1 = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex * 0x18 + 1 * 2);
+            int u2 = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex * 0x18 + 2 * 2);
+            int u3 = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex * 0x18 + 3 * 2);
+            int u4 = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex * 0x18 + 4 * 2);
+            int u5 = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex * 0x18 + 5 * 2);
+            int u6 = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex * 0x18 + 6 * 2);
+            int u7 = BitConverter.ToUInt16(sav, offset + 0xC + listBox1.SelectedIndex * 0x18 + 7 * 2);
+
+
+            // Display Data
+            TB_Berry.Text = berry.ToString();
+            TB_u1.Text = u1.ToString();
+            TB_u2.Text = u2.ToString();
+            TB_u3.Text = u3.ToString();
+            TB_u4.Text = u4.ToString();
+            TB_u5.Text = u5.ToString();
+            TB_u6.Text = u6.ToString();
+            TB_u7.Text = u7.ToString();
 
         }
 
diff --git a/f1-Main.cs b/f1-Main.cs
index d7df37790..ba22dce97 100644
--- a/f1-Main.cs
+++ b/f1-Main.cs
@@ -5721,6 +5721,8 @@ namespace PKHeX
                 updateAbilityNumber();
             else if ((cb == CB_Move1) || (cb == CB_Move2) || (cb == CB_Move3) || (cb == CB_Move4))
                 updatePP(sender, e);
+
+            UpdateIVs(null, null); // updating Nature will trigger stats to update as well
         }
         private void removedropCB(object sender, KeyEventArgs e)
         {
diff --git a/f3-MemoryAmie.cs b/f3-MemoryAmie.cs
index e0f7f2936..f1c4ff569 100644
--- a/f3-MemoryAmie.cs
+++ b/f3-MemoryAmie.cs
@@ -33,12 +33,15 @@ namespace PKHeX
                 if (arguments[i] == null) continue;
                 vartypes[i - 5] = arguments[i] + ":";
             }
-            disabled = arguments[0];
-            notleft = arguments[1];
-            ot = arguments[2];
-            past = arguments[3];
-            withOT = arguments[4];
-            
+            try
+            {
+                disabled = arguments[0];
+                notleft = arguments[1];
+                ot = arguments[2];
+                past = arguments[3];
+                withOT = arguments[4];
+            }
+            catch { };
             h = m_parent.buff;
 
             // Set the current friendship from main window