Replace most instances of "CurrentSave.Username"

12 files changed, 14 insertions, 1203 deletions

diff --git a/ShiftOS.Objects/Save.cs b/ShiftOS.Objects/Save.cs
index 1adaf3b..4f91db7 100644
--- a/ShiftOS.Objects/Save.cs
+++ b/ShiftOS.Objects/Save.cs
@@ -34,7 +34,11 @@ namespace ShiftOS.Objects
     //Better to store this stuff server-side so we can do some neat stuff with hacking...
     public class Save
     {
+
+        [Obsolete("This save variable is no longer used in Beta 2.4 and above of ShiftOS. Please use ShiftOS.Engine.SaveSystem.CurrentUser.Username to access the current user's username.")]
         public string Username { get; set; }
+
+
         public long Codepoints { get; set; }
         public Dictionary<string, bool> Upgrades { get; set; }
         public int StoryPosition { get; set; }
diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs
index 9e89e56..97c8a66 100644
--- a/ShiftOS.Server/Program.cs
+++ b/ShiftOS.Server/Program.cs
@@ -296,8 +296,6 @@ namespace ShiftOS.Server
         /// <param name="msg">Message.</param>
         public static void Interpret(ServerMessage msg)
 		{
-			Dictionary<string, object> args = null;
-
 			try
 			{
 				Console.WriteLine($@"[{DateTime.Now}] Message received from {msg.GUID}: {msg.Name}");
@@ -325,8 +323,7 @@ namespace ShiftOS.Server
                                                     try
                                                     {
                                                         object contents = null;
-                                                        bool throwOnNull = false;
-
+                                                        
 
                                                         if (mAttrib.ExpectedType == typeof(int))
                                                         {
@@ -354,7 +351,6 @@ namespace ShiftOS.Server
                                                         }
                                                         else if (mAttrib.ExpectedType == typeof(bool))
                                                         {
-                                                            throwOnNull = true;
                                                             if (msg.Contents.ToLower() == "true")
                                                             {
                                                                 contents = true;
@@ -371,7 +367,6 @@ namespace ShiftOS.Server
                                                         }
                                                         else if (mAttrib.ExpectedType == null)
                                                         {
-                                                            throwOnNull = false;
                                                         }
                                                         else if(mAttrib.ExpectedType == typeof(string))
                                                         {
diff --git a/ShiftOS.WinForms/Applications/Dialog.cs b/ShiftOS.WinForms/Applications/Dialog.cs
index 2abc705..f9d0b86 100644
--- a/ShiftOS.WinForms/Applications/Dialog.cs
+++ b/ShiftOS.WinForms/Applications/Dialog.cs
@@ -85,8 +85,6 @@ namespace ShiftOS.WinForms.Applications
 
         }
 
-        private Action OpenCallback = null;
-
         public void Open(string title, string msg, Action c = null)
         {
             new Dialog().OpenInternal(title, msg, c);
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index d35f7e0..32c5363 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -197,7 +197,7 @@ namespace ShiftOS.WinForms.Applications
 
         public void ResetAllKeywords()
         {
-            string primary = SaveSystem.CurrentSave.Username + " ";
+            string primary = SaveSystem.CurrentUser.Username + " ";
             string secondary = "shiftos ";
 
 
@@ -279,7 +279,7 @@ namespace ShiftOS.WinForms.Applications
                         {
                             if (TerminalBackend.PrefixEnabled)
                             {
-                                text3 = text4.Remove(0, $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
+                                text3 = text4.Remove(0, $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
                             }
                             TerminalBackend.LastCommand = text3;
                             TextSent?.Invoke(text4);
@@ -327,7 +327,7 @@ namespace ShiftOS.WinForms.Applications
                     {
                         var tostring3 = txt.Lines[txt.Lines.Length - 1];
                         var tostringlen = tostring3.Length + 1;
-                        var workaround = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                        var workaround = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
                         var derp = workaround.Length + 1;
                         if (tostringlen != derp)
                         {
@@ -347,7 +347,7 @@ namespace ShiftOS.WinForms.Applications
                 {
                     var getstring = txt.Lines[txt.Lines.Length - 1];
                     var stringlen = getstring.Length + 1;
-                    var header = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                    var header = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
                     var headerlen = header.Length + 1;
                     var selstart = txt.SelectionStart;
                     var remstrlen = txt.TextLength - stringlen;
@@ -365,7 +365,7 @@ namespace ShiftOS.WinForms.Applications
                 else if (a.KeyCode == Keys.Up)
                 {
                     var tostring3 = txt.Lines[txt.Lines.Length - 1];
-                    if (tostring3 == $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
+                    if (tostring3 == $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
                         Console.Write(TerminalBackend.LastCommand);
                     a.SuppressKeyPress = true;
 
@@ -465,7 +465,7 @@ namespace ShiftOS.WinForms.Applications
 
                             if (TerminalBackend.PrefixEnabled)
                             {
-                                Console.Write($"{SaveSystem.CurrentSave.Username}@shiftos:~$ ");
+                                Console.Write($"{SaveSystem.CurrentUser.Username}@shiftos:~$ ");
                             }
                         }
                         catch (Exception ex)
diff --git a/ShiftOS.WinForms/FakeSetupScreen.Designer.cs b/ShiftOS.WinForms/FakeSetupScreen.Designer.cs
deleted file mode 100644
index b14367b..0000000
--- a/ShiftOS.WinForms/FakeSetupScreen.Designer.cs
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace ShiftOS.WinForms
-{
-    partial class FakeSetupScreen
-    {
-        /// <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()
-        {
-            this.pnlheader = new System.Windows.Forms.Panel();
-            this.flbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnnext = new System.Windows.Forms.Button();
-            this.btnback = new System.Windows.Forms.Button();
-            this.page1 = new System.Windows.Forms.Panel();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.page2 = new System.Windows.Forms.Panel();
-            this.lbbyteszeroed = new System.Windows.Forms.Label();
-            this.pgformatprogress = new System.Windows.Forms.ProgressBar();
-            this.lbformattitle = new System.Windows.Forms.Label();
-            this.page3 = new System.Windows.Forms.Panel();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.label3 = new System.Windows.Forms.Label();
-            this.txtnewusername = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.txtnewpassword = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.txtnewsysname = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.page4 = new System.Windows.Forms.Panel();
-            this.txtlicenseagreement = new System.Windows.Forms.RichTextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.pgrereg = new System.Windows.Forms.Panel();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.label7 = new System.Windows.Forms.Label();
-            this.txtruname = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.txtrpass = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.txtrsys = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.pglogin = new System.Windows.Forms.Panel();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.label12 = new System.Windows.Forms.Label();
-            this.txtluser = new System.Windows.Forms.TextBox();
-            this.label13 = new System.Windows.Forms.Label();
-            this.txtlpass = new System.Windows.Forms.TextBox();
-            this.label15 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.btnnlogin = new System.Windows.Forms.Button();
-            this.flbuttons.SuspendLayout();
-            this.page1.SuspendLayout();
-            this.page2.SuspendLayout();
-            this.page3.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.page4.SuspendLayout();
-            this.pgrereg.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.pglogin.SuspendLayout();
-            this.tableLayoutPanel3.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pnlheader
-            // 
-            this.pnlheader.BackColor = System.Drawing.SystemColors.ControlDark;
-            this.pnlheader.Dock = System.Windows.Forms.DockStyle.Left;
-            this.pnlheader.Location = new System.Drawing.Point(0, 0);
-            this.pnlheader.Name = "pnlheader";
-            this.pnlheader.Size = new System.Drawing.Size(138, 300);
-            this.pnlheader.TabIndex = 0;
-            // 
-            // flbuttons
-            // 
-            this.flbuttons.AutoSize = true;
-            this.flbuttons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.flbuttons.Controls.Add(this.btnnext);
-            this.flbuttons.Controls.Add(this.btnback);
-            this.flbuttons.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flbuttons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
-            this.flbuttons.Location = new System.Drawing.Point(0, 300);
-            this.flbuttons.Name = "flbuttons";
-            this.flbuttons.Size = new System.Drawing.Size(490, 29);
-            this.flbuttons.TabIndex = 1;
-            // 
-            // btnnext
-            // 
-            this.btnnext.Location = new System.Drawing.Point(412, 3);
-            this.btnnext.Name = "btnnext";
-            this.btnnext.Size = new System.Drawing.Size(75, 23);
-            this.btnnext.TabIndex = 0;
-            this.btnnext.Text = "Next";
-            this.btnnext.UseVisualStyleBackColor = true;
-            this.btnnext.Click += new System.EventHandler(this.btnnext_Click);
-            // 
-            // btnback
-            // 
-            this.btnback.Location = new System.Drawing.Point(331, 3);
-            this.btnback.Name = "btnback";
-            this.btnback.Size = new System.Drawing.Size(75, 23);
-            this.btnback.TabIndex = 1;
-            this.btnback.Text = "Back";
-            this.btnback.UseVisualStyleBackColor = true;
-            this.btnback.Click += new System.EventHandler(this.btnback_Click);
-            // 
-            // page1
-            // 
-            this.page1.Controls.Add(this.label2);
-            this.page1.Controls.Add(this.label1);
-            this.page1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.page1.Location = new System.Drawing.Point(138, 0);
-            this.page1.Name = "page1";
-            this.page1.Size = new System.Drawing.Size(352, 300);
-            this.page1.TabIndex = 2;
-            // 
-            // label2
-            // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label2.Location = new System.Drawing.Point(20, 87);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(320, 199);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "This wizard will guide you through the installation and configuration of ShiftOS." +
-    "\r\n\r\nPress Next to continue.";
-            // 
-            // label1
-            // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
-            this.label1.Location = new System.Drawing.Point(19, 22);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(321, 44);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Welcome to the ShiftOS installation wizard.";
-            // 
-            // page2
-            // 
-            this.page2.Controls.Add(this.lbbyteszeroed);
-            this.page2.Controls.Add(this.pgformatprogress);
-            this.page2.Controls.Add(this.lbformattitle);
-            this.page2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.page2.Location = new System.Drawing.Point(138, 0);
-            this.page2.Name = "page2";
-            this.page2.Size = new System.Drawing.Size(352, 300);
-            this.page2.TabIndex = 2;
-            // 
-            // lbbyteszeroed
-            // 
-            this.lbbyteszeroed.AutoSize = true;
-            this.lbbyteszeroed.Location = new System.Drawing.Point(20, 91);
-            this.lbbyteszeroed.Name = "lbbyteszeroed";
-            this.lbbyteszeroed.Size = new System.Drawing.Size(127, 13);
-            this.lbbyteszeroed.TabIndex = 5;
-            this.lbbyteszeroed.Text = "Bytes zeroed: 0/1000000";
-            // 
-            // pgformatprogress
-            // 
-            this.pgformatprogress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pgformatprogress.Location = new System.Drawing.Point(23, 61);
-            this.pgformatprogress.Name = "pgformatprogress";
-            this.pgformatprogress.Size = new System.Drawing.Size(317, 23);
-            this.pgformatprogress.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
-            this.pgformatprogress.TabIndex = 4;
-            // 
-            // lbformattitle
-            // 
-            this.lbformattitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.lbformattitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
-            this.lbformattitle.Location = new System.Drawing.Point(16, 9);
-            this.lbformattitle.Name = "lbformattitle";
-            this.lbformattitle.Size = new System.Drawing.Size(321, 26);
-            this.lbformattitle.TabIndex = 3;
-            this.lbformattitle.Text = "Formatting your drive...";
-            // 
-            // page3
-            // 
-            this.page3.Controls.Add(this.btnnlogin);
-            this.page3.Controls.Add(this.tableLayoutPanel1);
-            this.page3.Controls.Add(this.label4);
-            this.page3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.page3.Location = new System.Drawing.Point(138, 0);
-            this.page3.Name = "page3";
-            this.page3.Size = new System.Drawing.Size(352, 300);
-            this.page3.TabIndex = 6;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.AutoSize = true;
-            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.txtnewusername, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label5, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.txtnewpassword, 1, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label6, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.txtnewsysname, 1, 2);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(20, 61);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(212, 72);
-            this.tableLayoutPanel1.TabIndex = 4;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(3, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(58, 13);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Username:";
-            // 
-            // txtnewusername
-            // 
-            this.txtnewusername.Location = new System.Drawing.Point(109, 3);
-            this.txtnewusername.Name = "txtnewusername";
-            this.txtnewusername.Size = new System.Drawing.Size(100, 20);
-            this.txtnewusername.TabIndex = 1;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(3, 26);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(56, 13);
-            this.label5.TabIndex = 2;
-            this.label5.Text = "Password:";
-            // 
-            // txtnewpassword
-            // 
-            this.txtnewpassword.Location = new System.Drawing.Point(109, 29);
-            this.txtnewpassword.Name = "txtnewpassword";
-            this.txtnewpassword.PasswordChar = '*';
-            this.txtnewpassword.Size = new System.Drawing.Size(100, 20);
-            this.txtnewpassword.TabIndex = 3;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(3, 52);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(75, 13);
-            this.label6.TabIndex = 4;
-            this.label6.Text = "System Name:";
-            // 
-            // txtnewsysname
-            // 
-            this.txtnewsysname.Location = new System.Drawing.Point(109, 55);
-            this.txtnewsysname.Name = "txtnewsysname";
-            this.txtnewsysname.Size = new System.Drawing.Size(100, 20);
-            this.txtnewsysname.TabIndex = 5;
-            // 
-            // label4
-            // 
-            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
-            this.label4.Location = new System.Drawing.Point(16, 9);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(321, 26);
-            this.label4.TabIndex = 3;
-            this.label4.Text = "User information";
-            // 
-            // page4
-            // 
-            this.page4.Controls.Add(this.txtlicenseagreement);
-            this.page4.Controls.Add(this.label10);
-            this.page4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.page4.Location = new System.Drawing.Point(138, 0);
-            this.page4.Name = "page4";
-            this.page4.Size = new System.Drawing.Size(352, 300);
-            this.page4.TabIndex = 7;
-            // 
-            // txtlicenseagreement
-            // 
-            this.txtlicenseagreement.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtlicenseagreement.Location = new System.Drawing.Point(23, 58);
-            this.txtlicenseagreement.Name = "txtlicenseagreement";
-            this.txtlicenseagreement.ReadOnly = true;
-            this.txtlicenseagreement.Size = new System.Drawing.Size(326, 228);
-            this.txtlicenseagreement.TabIndex = 4;
-            this.txtlicenseagreement.Text = "";
-            // 
-            // label10
-            // 
-            this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
-            this.label10.Location = new System.Drawing.Point(16, 9);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(321, 26);
-            this.label10.TabIndex = 3;
-            this.label10.Text = "License Agreement";
-            // 
-            // pgrereg
-            // 
-            this.pgrereg.Controls.Add(this.tableLayoutPanel2);
-            this.pgrereg.Controls.Add(this.label11);
-            this.pgrereg.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pgrereg.Location = new System.Drawing.Point(138, 0);
-            this.pgrereg.Name = "pgrereg";
-            this.pgrereg.Size = new System.Drawing.Size(352, 300);
-            this.pgrereg.TabIndex = 8;
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.AutoSize = true;
-            this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel2.ColumnCount = 2;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.Controls.Add(this.label7, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.txtruname, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.label8, 0, 1);
-            this.tableLayoutPanel2.Controls.Add(this.txtrpass, 1, 1);
-            this.tableLayoutPanel2.Controls.Add(this.label9, 0, 2);
-            this.tableLayoutPanel2.Controls.Add(this.txtrsys, 1, 2);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(20, 61);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 3;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(212, 72);
-            this.tableLayoutPanel2.TabIndex = 4;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(3, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(58, 13);
-            this.label7.TabIndex = 0;
-            this.label7.Text = "Username:";
-            // 
-            // txtruname
-            // 
-            this.txtruname.Location = new System.Drawing.Point(109, 3);
-            this.txtruname.Name = "txtruname";
-            this.txtruname.Size = new System.Drawing.Size(100, 20);
-            this.txtruname.TabIndex = 1;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(3, 26);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(56, 13);
-            this.label8.TabIndex = 2;
-            this.label8.Text = "Password:";
-            // 
-            // txtrpass
-            // 
-            this.txtrpass.Location = new System.Drawing.Point(109, 29);
-            this.txtrpass.Name = "txtrpass";
-            this.txtrpass.PasswordChar = '*';
-            this.txtrpass.Size = new System.Drawing.Size(100, 20);
-            this.txtrpass.TabIndex = 3;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(3, 52);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(75, 13);
-            this.label9.TabIndex = 4;
-            this.label9.Text = "System Name:";
-            // 
-            // txtrsys
-            // 
-            this.txtrsys.Location = new System.Drawing.Point(109, 55);
-            this.txtrsys.Name = "txtrsys";
-            this.txtrsys.Size = new System.Drawing.Size(100, 20);
-            this.txtrsys.TabIndex = 5;
-            // 
-            // label11
-            // 
-            this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
-            this.label11.Location = new System.Drawing.Point(16, 9);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(321, 26);
-            this.label11.TabIndex = 3;
-            this.label11.Text = "User information";
-            // 
-            // pglogin
-            // 
-            this.pglogin.Controls.Add(this.tableLayoutPanel3);
-            this.pglogin.Controls.Add(this.label15);
-            this.pglogin.Controls.Add(this.button1);
-            this.pglogin.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pglogin.Location = new System.Drawing.Point(138, 0);
-            this.pglogin.Name = "pglogin";
-            this.pglogin.Size = new System.Drawing.Size(352, 300);
-            this.pglogin.TabIndex = 9;
-            // 
-            // tableLayoutPanel3
-            // 
-            this.tableLayoutPanel3.AutoSize = true;
-            this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel3.ColumnCount = 2;
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel3.Controls.Add(this.label12, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.txtluser, 1, 0);
-            this.tableLayoutPanel3.Controls.Add(this.label13, 0, 1);
-            this.tableLayoutPanel3.Controls.Add(this.txtlpass, 1, 1);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(20, 61);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 3;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(212, 72);
-            this.tableLayoutPanel3.TabIndex = 4;
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(3, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(58, 13);
-            this.label12.TabIndex = 0;
-            this.label12.Text = "Username:";
-            // 
-            // txtluser
-            // 
-            this.txtluser.Location = new System.Drawing.Point(109, 3);
-            this.txtluser.Name = "txtluser";
-            this.txtluser.Size = new System.Drawing.Size(100, 20);
-            this.txtluser.TabIndex = 1;
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(3, 26);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(56, 13);
-            this.label13.TabIndex = 2;
-            this.label13.Text = "Password:";
-            // 
-            // txtlpass
-            // 
-            this.txtlpass.Location = new System.Drawing.Point(109, 29);
-            this.txtlpass.Name = "txtlpass";
-            this.txtlpass.PasswordChar = '*';
-            this.txtlpass.Size = new System.Drawing.Size(100, 20);
-            this.txtlpass.TabIndex = 3;
-            // 
-            // label15
-            // 
-            this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
-            this.label15.Location = new System.Drawing.Point(16, 9);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(321, 26);
-            this.label15.TabIndex = 3;
-            this.label15.Text = "User information";
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(129, 142);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 21);
-            this.button1.TabIndex = 4;
-            this.button1.Text = "Register";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // btnnlogin
-            // 
-            this.btnnlogin.Location = new System.Drawing.Point(129, 156);
-            this.btnnlogin.Name = "btnnlogin";
-            this.btnnlogin.Size = new System.Drawing.Size(75, 23);
-            this.btnnlogin.TabIndex = 5;
-            this.btnnlogin.Text = "Log in";
-            this.btnnlogin.UseVisualStyleBackColor = true;
-            this.btnnlogin.Click += new System.EventHandler(this.btnnlogin_Click);
-            // 
-            // FakeSetupScreen
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(490, 329);
-            this.Controls.Add(this.pglogin);
-            this.Controls.Add(this.page3);
-            this.Controls.Add(this.pgrereg);
-            this.Controls.Add(this.page4);
-            this.Controls.Add(this.page2);
-            this.Controls.Add(this.page1);
-            this.Controls.Add(this.pnlheader);
-            this.Controls.Add(this.flbuttons);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FakeSetupScreen";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "ShiftOS";
-            this.TopMost = true;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FakeSetupScreen_FormClosing);
-            this.flbuttons.ResumeLayout(false);
-            this.page1.ResumeLayout(false);
-            this.page2.ResumeLayout(false);
-            this.page2.PerformLayout();
-            this.page3.ResumeLayout(false);
-            this.page3.PerformLayout();
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.page4.ResumeLayout(false);
-            this.pgrereg.ResumeLayout(false);
-            this.pgrereg.PerformLayout();
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.tableLayoutPanel2.PerformLayout();
-            this.pglogin.ResumeLayout(false);
-            this.pglogin.PerformLayout();
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel pnlheader;
-        private System.Windows.Forms.FlowLayoutPanel flbuttons;
-        private System.Windows.Forms.Button btnnext;
-        private System.Windows.Forms.Button btnback;
-        private System.Windows.Forms.Panel page1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Panel page2;
-        private System.Windows.Forms.Label lbformattitle;
-        private System.Windows.Forms.Label lbbyteszeroed;
-        private System.Windows.Forms.ProgressBar pgformatprogress;
-        private System.Windows.Forms.Panel page3;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox txtnewusername;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox txtnewpassword;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox txtnewsysname;
-        private System.Windows.Forms.Panel page4;
-        private System.Windows.Forms.RichTextBox txtlicenseagreement;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Panel pgrereg;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox txtruname;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox txtrpass;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox txtrsys;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Panel pglogin;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.TextBox txtluser;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.TextBox txtlpass;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button btnnlogin;
-    }
-}
\ No newline at end of file
diff --git a/ShiftOS.WinForms/FakeSetupScreen.cs b/ShiftOS.WinForms/FakeSetupScreen.cs
deleted file mode 100644
index f62c777..0000000
--- a/ShiftOS.WinForms/FakeSetupScreen.cs
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Newtonsoft.Json;
-using ShiftOS.Engine;
-
-namespace ShiftOS.WinForms
-{
-    public partial class FakeSetupScreen : Form
-    {
-        private Oobe oobe = null;
-
-        public Action<bool> MUDUserFound = null;
-
-        public FakeSetupScreen(Oobe _oobe, int page = 0)
-        {
-            oobe = _oobe;
-            InitializeComponent();
-            currentPage = page;
-            SetupUI();
-            ServerManager.MessageReceived += (msg) =>
-            {
-                if (this.Visible == true)
-                {
-                    if (msg.Name == "mud_notfound")
-                        this.Invoke(new Action(() => { MUDUserFound?.Invoke(false); }));
-                    else if (msg.Name == "mud_found")
-                        this.Invoke(new Action(() => { MUDUserFound?.Invoke(true); }));
-                }
-            };
-        }
-
-        public event Action<string> TextSent;
-        bool isTyping = false;
-
-        private int currentPage = 0;
-
-        public void SetupUI()
-        {
-            btnback.Show();
-            pnlheader.Dock = DockStyle.Top;
-            pnlheader.Height = 50;
-            switch (currentPage)
-            {
-                case 0:
-                    page1.BringToFront();
-                    pnlheader.Dock = DockStyle.Left;
-                    pnlheader.Width = 100;
-                    btnback.Hide();
-                    break;
-                case 1:
-                    btnnext.Hide();
-                    btnback.Hide();
-                    page2.BringToFront();
-                    pgformatprogress.Value = 0;
-                    var dinf = new System.IO.DriveInfo("C:");
-                    StartWipingInBackground(((dinf.TotalSize / 1024) / 1024) / 1024);
-                    TextType($@"So I see you're progressing through.
-I really hope you aren't one of those newbies who just next-next-next-finish their way through these things.
-I see you've named your drive " + dinf.VolumeLabel + $@"
-And it can contain up to {dinf.TotalSize} bytes of information.
-And you've formatted this drive with a partition of type " + dinf.DriveFormat + $@".
-Interesting...
-Very interesting...");
-                    break;
-                case 2:
-                    btnnext.Show();
-                    btnback.Hide();
-                    TextType(@"Now it's all gone. Now I need some user input so I can install ShiftOS.
-Firstly, please enter a username, password, and system name.
-Make the username and system name unique so I can identify exactly who you are. You're not the only one here.
-Also, make sure the password is secure... There have been people known to breach users' accounts in ShiftOS and steal their stuff.
-So make sure your password is secure enough that it can't be guessed, but easy for you to remember, and don't put any personal information in your account.");
-                    page3.BringToFront();
-                    break;
-                case 3:
-                    if (string.IsNullOrEmpty(txtnewusername.Text))
-                    {
-                        TextType("You must specify a valid username!");
-                        currentPage--;
-                        //SetupUI();
-                        break;
-                    }
-
-                    if (string.IsNullOrEmpty(txtnewpassword.Text))
-                    {
-                        TextType("A password would seriously be recommended.");
-                        currentPage--;
-                        //SetupUI();
-                        break;
-                    }
-
-                    if (string.IsNullOrEmpty(txtnewsysname.Text))
-                    {
-                        TextType("You must name your computer.");
-                        currentPage--;
-                        //SetupUI();
-                        break;
-                    }
-
-
-                    MUDUserFound = (val) =>
-                    {
-                        if(val == true)
-                        {
-                            TextType("I have just verified that your username and password already exists on my end. Please choose another.");
-                            currentPage--;
-                            //SetupUI();
-                            
-                        }
-                        else
-                        {
-                            TextType("I am going to keep that info on my checklist for installing ShiftOS on your system. Now, onto some legal stuff. I highly suggest you read this.");
-                            currentPage++;
-                            oobe.MySave.Username = txtnewusername.Text;
-                            oobe.MySave.Password = txtnewpassword.Text;
-                            oobe.MySave.SystemName = txtnewsysname.Text;
-                            SetupUI();
-                        }
-                    };
-                    ServerManager.SendMessage("mud_checkuserexists", $@"{{
-    username: ""{txtnewusername.Text}"",
-    password: ""{txtnewpassword.Text}""
-}}");
-                    break;
-                case 4:
-                    page4.BringToFront();
-                    txtlicenseagreement.Rtf = Properties.Resources.ShiftOS;
-                    break;
-                case 5:
-                    CanClose = true;
-                    this.Close();
-                    break;
-                case 7:
-                    btnnext.Show();
-                    btnback.Hide();
-                    pgrereg.BringToFront();
-                    TextType("You have two choices - either you can migrate your local user file to this multi-user domain, or you can restart with 0 Codepoints, no upgrades, and still keep your files.");
-                    break;
-                case 8:
-                    btnnext.Hide();
-                    ServerMessageReceived rc = null;
-
-                    rc = (msg) =>
-                    {
-                        if(msg.Name == "mud_found")
-                        {
-                            TextType("That username and password already exists in this multi-user domain. Please choose another.");
-                            currentPage = 7;
-                        }
-                        else if(msg.Name == "mud_notfound")
-                        {
-                            currentPage = 9;
-                            SetupUI();
-                        }
-                        ServerManager.MessageReceived -= rc;
-                    };
-
-                    if (string.IsNullOrEmpty(txtruname.Text))
-                    {
-                        TextType("You must provide a username.");
-                        currentPage = 7;
-                    }
-
-                    if (string.IsNullOrEmpty(txtrpass.Text))
-                    {
-                        TextType("You must provide a password.");
-                        currentPage = 7;
-                    }
-
-                    if (string.IsNullOrEmpty(txtrsys.Text))
-                    {
-                        TextType("You must provide a system hostname.");
-                        currentPage = 7;
-                    }
-
-                    if (currentPage == 7)
-                        return;
-
-                    ServerManager.MessageReceived += rc;
-                    ServerManager.SendMessage("mud_checkuserexists", $@"{{
-    username: ""{txtruname.Text}"",
-    password: ""{txtrpass.Text}""
-}}");
-                    break;
-                case 9:
-                    UserReregistered?.Invoke(txtruname.Text, txtrpass.Text, txtrsys.Text);
-                    this.CanClose = true;
-                    this.Close();
-                    break;
-                case 10:
-                    btnnext.Show();
-                    btnback.Hide();
-                    pglogin.BringToFront();
-                    break;
-                case 11:
-                    btnnext.Hide();
-                    ServerMessageReceived login = null;
-
-                    login = (msg) =>
-                    {
-                        if (msg.Name == "mud_found")
-                        {
-                            this.Invoke(new Action(() =>
-                            {
-                                currentPage = 12;
-                                SetupUI();
-                            }));
-
-                            ServerManager.MessageReceived -= login;
-                        }
-                        else if (msg.Name == "mud_notfound")
-                        {
-                            this.Invoke(new Action(() =>
-                            {
-                                currentPage = 10;
-                                SetupUI();
-                            }));
-
-                            ServerManager.MessageReceived -= login;
-                        }
-                    };
-
-                    ServerManager.MessageReceived += login;
-                    if(!string.IsNullOrWhiteSpace(txtluser.Text) && !string.IsNullOrWhiteSpace(txtlpass.Text))
-                    {
-                        ServerManager.SendMessage("mud_checkuserexists", JsonConvert.SerializeObject(new
-                        {
-                            username = txtluser.Text,
-                            password = txtlpass.Text
-                        }));
-                    }
-                    break;
-                case 12:
-                    btnnext.Hide();
-                    ServerMessageReceived getsave = null;
-
-                    getsave = (msg) =>
-                    {
-                        if (msg.Name == "mud_savefile")
-                        {
-                            this.Invoke(new Action(() =>
-                            {
-                                SaveSystem.CurrentSave = JsonConvert.DeserializeObject<ShiftOS.Objects.Save>(msg.Contents);
-                                SaveSystem.SaveGame();
-                                CreateNewSave = false;
-                                DoneLoggingIn?.Invoke();
-                                this.CanClose = true;
-                                this.Close();
-
-                            }));
-                        }
-                        else if (msg.Name == "mud_notfound")
-                        {
-                            this.Invoke(new Action(() =>
-                            {
-                                currentPage = 10;
-                                SetupUI();
-                            }));
-                        }
-                        ServerManager.MessageReceived -= getsave;
-                    };
-
-                    ServerManager.MessageReceived += getsave;
-
-                    ServerManager.SendMessage("mud_login", JsonConvert.SerializeObject(new
-                    {
-                        username = txtluser.Text,
-                        password = txtlpass.Text
-                    }));
-
-                    break;
-            }
-        }
-
-        public event Action DoneLoggingIn;
-
-        public bool CreateNewSave = true;
-
-        public event Action<string, string, string> UserReregistered;
-
-        public void StartWipingInBackground(long arbitraryAmountOfBytes)
-        {
-            pgformatprogress.Maximum = (int)arbitraryAmountOfBytes;
-            var t = new Thread(() =>
-            {
-                for(long i = 0; i <= arbitraryAmountOfBytes; i++)
-                {
-                    Thread.Sleep(40);
-                    this.Invoke(new Action(() =>
-                    {
-                        pgformatprogress.Value = (int)i;
-                        lbbyteszeroed.Text = $"Gigabytes zeroed: {i}/{arbitraryAmountOfBytes}";
-                    }));
-                }
-                this.Invoke(new Action(() =>
-                {
-                    currentPage++;
-                    SetupUI();
-                }));
-            });
-            t.IsBackground = true;
-            t.Start();
-        }
-
-        
-
-        private void TextType(string text)
-        {
-            new Thread(() =>
-            {
-                while(isTyping == true)
-                {
-
-                }
-                isTyping = true;
-                TextSent?.Invoke(text);
-                isTyping = false;
-            }).Start();
-        }
-
-        bool CanClose = false;
-
-        private void FakeSetupScreen_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            if (CanClose)
-            {
-
-            }
-            else
-            {
-                e.Cancel = true;
-                TextType("Don't try to close the dialog. It's a futile attempt.");
-            }
-        }
-
-        private void btnback_Click(object sender, EventArgs e)
-        {
-            currentPage--;
-            SetupUI();
-        }
-
-        private void btnnext_Click(object sender, EventArgs e)
-        {
-            currentPage++;
-            SetupUI();
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            ShiftOS.Objects.ShiftFS.Utils.Delete(Paths.GetPath("user.dat"));
-            System.IO.File.WriteAllText(Paths.SaveFile, ShiftOS.Objects.ShiftFS.Utils.ExportMount(0));
-            SaveSystem.NewSave();
-            this.CanClose = true;
-            this.Close();
-        }
-
-        private void btnnlogin_Click(object sender, EventArgs e)
-        {
-            currentPage = 10;
-            SetupUI();
-        }
-    }
-}
diff --git a/ShiftOS.WinForms/FakeSetupScreen.resx b/ShiftOS.WinForms/FakeSetupScreen.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/ShiftOS.WinForms/FakeSetupScreen.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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>
-</root>
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs
index 54a022c..a4d63e0 100644
--- a/ShiftOS.WinForms/Oobe.cs
+++ b/ShiftOS.WinForms/Oobe.cs
@@ -185,39 +185,7 @@ You must join the digital society, rise up the ranks, and save us.
 
         public void ShowSaveTransfer(Save save)
         {
-            this.Show();
-            var fSetup = new FakeSetupScreen(this, 7);
-
-            var t = new Thread(() =>
-            {
-                textgeninput = lblhackwords;
-                Clear();
-                TextType("Welcome back to ShiftOS.");
-                Thread.Sleep(500);
-                TextType("Since your last time inside ShiftOS, the operating system has changed. Your user account is no longer stored on your local system.");
-                Thread.Sleep(500);
-                this.Invoke(new Action(() =>
-                {
-                    //UPS is drunky heaven over here... it's a liquor store, I think... - Drunk Michael
-                    fSetup.UserReregistered += (u, p, s) =>
-                    {
-                        save.Username = u;
-                        save.Password = p;
-                        save.SystemName = s;
-                        SaveSystem.CurrentSave = save;
-                        SaveSystem.CurrentSave.Upgrades = new Dictionary<string, bool>();
-                        Shiftorium.Init();
-
-                        SaveSystem.SaveGame();
-                        if(Utils.FileExists(Paths.SaveFileInner))
-                            Utils.Delete(Paths.SaveFileInner);
-                        this.Close();
-                    };
-                    fSetup.Show();
-                }));
-            });
-            t.IsBackground = true;
-            t.Start();
+            //Stub.
         }
 
         public void PerformUniteLogin()
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 1d4e91a..9fc237f 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -316,12 +316,6 @@
     <Compile Include="DownloadControl.Designer.cs">
       <DependentUpon>DownloadControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="FakeSetupScreen.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FakeSetupScreen.Designer.cs">
-      <DependentUpon>FakeSetupScreen.cs</DependentUpon>
-    </Compile>
     <Compile Include="GUIFunctions.cs" />
     <Compile Include="HackerCommands.cs" />
     <Compile Include="IDesktopWidget.cs" />
@@ -517,9 +511,6 @@
     <EmbeddedResource Include="DownloadControl.resx">
       <DependentUpon>DownloadControl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FakeSetupScreen.resx">
-      <DependentUpon>FakeSetupScreen.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Oobe.resx">
       <DependentUpon>Oobe.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index d7c5196..6825f34 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -52,7 +52,6 @@ namespace ShiftOS.WinForms
         public List<IDesktopWidget> Widgets = new List<IDesktopWidget>();
 
 
-        private bool InScreensaver = false;
         private int millisecondsUntilScreensaver = 300000;
 
         /// <summary>
@@ -231,13 +230,11 @@ namespace ShiftOS.WinForms
                         if(millisecondsUntilScreensaver <= 0)
                         {
                             ShowScreensaver();
-                            InScreensaver = true;
                         }
                         millisecondsUntilScreensaver--;
                         Thread.Sleep(1);
                     }
                     millisecondsUntilScreensaver = 300000;
-                    InScreensaver = false;
                     HideScreensaver();
                 }
             });
@@ -990,7 +987,7 @@ namespace ShiftOS.WinForms
         {
             if (Shiftorium.UpgradeInstalled("advanced_app_launcher"))
             {
-                lbalstatus.Text = $@"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}
+                lbalstatus.Text = $@"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}
 {SaveSystem.CurrentSave.Codepoints} Codepoints
 {Shiftorium.GetAvailable().Length} available, {SaveSystem.CurrentSave.CountUpgrades()} installed.";
 
diff --git a/ShiftOS_TheReturn/CommandParser.cs b/ShiftOS_TheReturn/CommandParser.cs
index 7a190df..868d27a 100644
--- a/ShiftOS_TheReturn/CommandParser.cs
+++ b/ShiftOS_TheReturn/CommandParser.cs
@@ -98,8 +98,6 @@ namespace ShiftOS.Engine
             int firstValuePos = -1;
             int lastValuePos = -1;
 
-            string syntaxError = "";
-
             for (int ii = 0; ii < parts.Count; ii++)
             {
                 CommandFormat part = parts[ii];
@@ -184,7 +182,6 @@ namespace ShiftOS.Engine
                     else
                     {
                         position = text.Length;
-                        syntaxError = "Syntax Error";
                         command = "+FALSE+";
                     }
                     help = -1;
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 7980635..87aacd6 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -73,7 +73,7 @@ namespace ShiftOS.Engine
                 TerminalBackend.IsForwardingConsoleWrites = forwarding;
                 TerminalBackend.ForwardGUID = (forwarding == true) ? fGuid : null;
                 string resultFriendly = (result == true) ? "yes" : "no";
-                Console.WriteLine($"{SaveSystem.CurrentSave.Username} says {resultFriendly}.");
+                Console.WriteLine($"{SaveSystem.CurrentUser.Username} says {resultFriendly}.");
                 TerminalBackend.IsForwardingConsoleWrites = false;
             };
             Desktop.InvokeOnWorkerThread(new Action(() =>