diff --git a/ShiftOS.Frontend/Apps/Terminal.cs b/ShiftOS.Frontend/Apps/Terminal.cs
index f3aeaf1..c554957 100644
--- a/ShiftOS.Frontend/Apps/Terminal.cs
+++ b/ShiftOS.Frontend/Apps/Terminal.cs
@@ -36,6 +36,16 @@ namespace ShiftOS.Frontend.Apps
             _terminal.Layout();
             AppearanceManager.ConsoleOut = _terminal;
             AppearanceManager.StartConsoleOut();
+            TerminalBackend.PrintPrompt();
+            SaveSystem.GameReady += () =>
+            {
+                if (Shiftorium.UpgradeInstalled("desktop"))
+                {
+                    AppearanceManager.Close(this);
+                }
+                else
+                    TerminalBackend.PrintPrompt();
+            };
         }
 
         protected override void OnLayout()
@@ -287,7 +297,8 @@ namespace ShiftOS.Frontend.Apps
                 }
                 if (a.KeyChar != '\0')
                 {
-                    base.OnKeyEvent(a);
+                    Text = Text.Insert(Index, a.KeyChar.ToString());
+                    Index++;
                     AppearanceManager.CurrentPosition++;
                     RecalculateLayout();
                     InvalidateTopLevel();
diff --git a/ShiftOS.Frontend/Commands.cs b/ShiftOS.Frontend/Commands.cs
new file mode 100644
index 0000000..f3f81aa
--- /dev/null
+++ b/ShiftOS.Frontend/Commands.cs
@@ -0,0 +1,474 @@
+/*
+ * 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.
+ */
+
+#define DEVEL
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ShiftOS.Engine.Properties;
+using System.IO;
+using Newtonsoft.Json;
+using System.IO.Compression;
+
+using ShiftOS.Objects;
+using ShiftOS.Engine.Scripting;
+using ShiftOS.Objects.ShiftFS;
+using ShiftOS.Engine;
+
+namespace ShiftOS.Frontend
+{
+    [TutorialLock]
+    public static class TerminalCommands
+    {
+        [Command("clear", description = "{DESC_CLEAR}")]
+        public static bool Clear()
+        {
+            Engine.Desktop.InvokeOnWorkerThread(() =>
+            {
+                AppearanceManager.ConsoleOut.Clear();
+            });
+            return true;
+        }
+    }
+
+    public static class ShiftOSCommands
+    {
+
+        [Command("setsfxenabled", description = "{DESC_SETSFXENABLED}")]
+        [RequiresArgument("value")]
+        public static bool SetSfxEnabled(Dictionary<string, object> args)
+        {
+            try
+            {
+                bool value = Convert.ToBoolean(args["value"].ToString());
+                SaveSystem.CurrentSave.SoundEnabled = value;
+                SaveSystem.SaveGame();
+            }
+            catch
+            {
+                Console.WriteLine("{ERR_BADBOOL}");
+            }
+            return true;
+        }
+
+
+
+        [Command("setmusicenabled", description = "{DESC_SETMUSICENABLED}")]
+        [RequiresArgument("value")]
+        public static bool SetMusicEnabled(Dictionary<string, object> args)
+        {
+            try
+            {
+                bool value = Convert.ToBoolean(args["value"].ToString());
+                SaveSystem.CurrentSave.MusicEnabled = value;
+                SaveSystem.SaveGame();
+            }
+            catch
+            {
+                Console.WriteLine("{ERR_BADBOOL}");
+            }
+            return true;
+        }
+
+        
+
+        [Command("setvolume", description ="{DESC_SETVOLUME}")]
+        [RequiresArgument("value")]
+        public static bool SetSfxVolume(Dictionary<string, object> args)
+        {
+            int value = int.Parse(args["value"].ToString());
+            if(value >= 0 && value <= 100)
+            {
+                SaveSystem.CurrentSave.MusicVolume = value;
+                SaveSystem.SaveGame();
+            }
+            else
+            {
+                Console.WriteLine("{ERR_BADPERCENT}");
+            }
+            return true;
+        }
+
+        [RemoteLock]
+        [Command("shutdown", description = "{DESC_SHUTDOWN}")]
+        public static bool Shutdown()
+        {
+            SaveSystem.SaveGame();
+            AppearanceManager.Exit();
+            return true;
+        }
+
+        [Command("lang", description = "{DESC_LANG}")]
+        [RequiresArgument("language")]
+        public static bool SetLanguage(Dictionary<string, object> userArgs)
+        {
+            try
+            {
+                string lang = "";
+
+                lang = (string)userArgs["language"];
+                
+                if (Localization.GetAllLanguages().Contains(lang))
+                {
+                    SaveSystem.CurrentSave.Language = lang;
+                    SaveSystem.SaveGame();
+                    Console.WriteLine("{RES_LANGUAGE_CHANGED}");
+                    return true;
+                }
+
+                throw new Exception("{ERR_NOLANG}");
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        [Command("commands", "", "{DESC_COMMANDS}")]
+        public static bool Commands()
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine("{GEN_COMMANDS}");
+            sb.AppendLine("=================");
+            sb.AppendLine();
+            //print all unique namespaces.
+            foreach (var n in TerminalBackend.Commands.Where(x => !(x is TerminalBackend.WinOpenCommand) && Shiftorium.UpgradeInstalled(x.Dependencies) && x.CommandInfo.hide == false).OrderBy(x => x.CommandInfo.name))
+            {
+                sb.Append(" - " + n.CommandInfo.name);
+                if (!string.IsNullOrWhiteSpace(n.CommandInfo.description))
+                    if (Shiftorium.UpgradeInstalled("help_description"))
+                        sb.Append(" - " + n.CommandInfo.description);
+                sb.AppendLine();
+            }
+
+            Console.WriteLine(sb.ToString());
+
+            return true;
+        }
+
+        [Command("help", description = "{DESC_HELP}")]
+        public static bool Help()
+        {
+            Commands();
+            WindowCommands.Programs();
+            return true;
+        }
+
+
+        [MultiplayerOnly]
+        [Command("save", description = "{DESC_SAVE}")]
+        public static bool Save()
+        {
+            SaveSystem.SaveGame();
+            return true;
+        }
+
+        [MultiplayerOnly]
+        [Command("status", description = "{DESC_STATUS}")]
+        public static bool Status()
+        {
+            string version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+
+           string cp = SaveSystem.CurrentSave.Codepoints.ToString();
+           string installed = SaveSystem.CurrentSave.CountUpgrades().ToString();
+            string available = Shiftorium.GetAvailable().Length.ToString();
+
+            Console.WriteLine(Localization.Parse("{COM_STATUS}", new Dictionary<string, string>
+            {
+                ["%cp"] = cp,
+                ["%version"] = version,
+                ["%installed"] = installed,
+                ["%available"] = available
+            }));
+            Console.WriteLine("{GEN_OBJECTIVES}");
+            try
+            {
+                if (Story.CurrentObjectives.Count > 0)
+                {
+                    foreach (var obj in Story.CurrentObjectives)
+                    {
+                        Console.WriteLine(obj.Name);
+                        Console.WriteLine("-------------------------------");
+                        Console.WriteLine();
+                        Console.WriteLine(obj.Description);
+                    }
+                }
+                else
+                {
+                    Console.WriteLine("{RES_NOOBJECTIVES}");
+                }
+            }
+            catch
+            {
+                Console.WriteLine("{RES_NOOBJECTIVES}");
+            }
+            return true;
+        }
+    }
+
+    public static class ShiftoriumCommands
+    {
+        [Command("buy", description = "{DESC_BUY}")]
+        [RequiresArgument("upgrade")]
+        public static bool BuyUpgrade(Dictionary<string, object> userArgs)
+        {
+            try
+            {
+                string upgrade = "";
+
+                upgrade = (string)userArgs["upgrade"];
+
+                var upg = Shiftorium.GetAvailable().FirstOrDefault(x => x.ID == upgrade);
+                if(upg != null)
+                {
+                    if (!Shiftorium.Buy(upg.ID, upg.Cost) == true)
+                        Console.WriteLine("{ERR_NOTENOUGHCODEPOINTS}");
+                }
+                else
+                {
+                    Console.WriteLine("{ERR_NOUPGRADE}");
+                }
+
+            }
+            catch
+            {
+                Console.WriteLine("{ERR_GENERAL}");
+            }
+            return true;
+        }
+
+        [RequiresUpgrade("shiftorium_bulk_buy")]
+        [Command("bulkbuy", description = "{DESC_BULKBUY}")]
+        [RequiresArgument("upgrades")]
+        public static bool BuyBulk(Dictionary<string, object> args)
+        {
+            if (args.ContainsKey("upgrades"))
+            {
+                string[] upgrade_list = (args["upgrades"] as string).Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var upg in upgrade_list)
+                {
+                    var dict = new Dictionary<string, object>();
+                    dict.Add("upgrade", upg);
+                    BuyUpgrade(dict);
+                }
+            }
+            return true;
+        }
+
+
+        [Command("upgradeinfo", description ="{DESC_UPGRADEINFO}")]
+        [RequiresArgument("upgrade")]
+        public static bool ViewInfo(Dictionary<string, object> userArgs)
+        {
+            try
+            {
+                string upgrade = "";
+
+                upgrade = (string)userArgs["upgrade"];
+
+                foreach (var upg in Shiftorium.GetDefaults())
+                {
+                    if (upg.ID == upgrade)
+                    {
+                        Console.WriteLine(Localization.Parse("{COM_UPGRADEINFO}", new Dictionary<string, string>
+                        {
+                            ["%id"] = upg.ID,
+                            ["%category"] = upg.Category,
+                            ["%name"] = upg.Name,
+                            ["%cost"] = upg.Cost.ToString(),
+                            ["%description"] = upg.Description
+                        }));
+
+                        return true;
+                    }
+                }
+
+                throw new Exception("{ERR_NOUPGRADE}");
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        [Command("upgradecategories", description = "{DESC_UPGRADECATEGORIES}")]
+        public static bool ListCategories()
+        {
+            foreach(var cat in Shiftorium.GetCategories())
+            {
+                Console.WriteLine(Localization.Parse("{SHFM_CATEGORY}", new Dictionary<string, string>
+                {
+                    ["%name"] = cat,
+                    ["%available"] = Shiftorium.GetAvailable().Where(x=>x.Category==cat).Count().ToString()
+                }));
+            }
+            return true;
+        }
+
+        [Command("upgrades", description ="{DESC_UPGRADES}")]
+        public static bool ListAll(Dictionary<string, object> args)
+        {
+            try
+            {
+                bool showOnlyInCategory = false;
+
+                string cat = "Other";
+
+                if (args.ContainsKey("cat"))
+                {
+                    showOnlyInCategory = true;
+                    cat = args["cat"].ToString();
+                }
+
+                Dictionary<string, ulong> upgrades = new Dictionary<string, ulong>();
+                int maxLength = 5;
+
+                IEnumerable<ShiftoriumUpgrade> upglist = Shiftorium.GetAvailable();
+                if (showOnlyInCategory)
+                {
+                    if (Shiftorium.IsCategoryEmptied(cat))
+                    {
+                        ConsoleEx.Bold = true;
+                        ConsoleEx.ForegroundColor = ConsoleColor.Red;
+                        Console.WriteLine("{SHFM_QUERYERROR}");
+                        Console.WriteLine();
+                        ConsoleEx.Bold = false;
+                        ConsoleEx.ForegroundColor = ConsoleColor.Gray;
+                        Console.WriteLine("{ERR_EMPTYCATEGORY}");
+                        return true;
+                    }
+                    upglist = Shiftorium.GetAvailable().Where(x => x.Category == cat);
+                }
+
+
+                if(upglist.Count() == 0)
+                {
+                    ConsoleEx.Bold = true;
+                    ConsoleEx.ForegroundColor = ConsoleColor.Red;
+                    Console.WriteLine("{SHFM_NOUPGRADES}");
+                    Console.WriteLine();
+                    ConsoleEx.Bold = false;
+                    ConsoleEx.ForegroundColor = ConsoleColor.Gray;
+                    Console.WriteLine("{ERR_NOMOREUPGRADES}");
+                    return true;
+
+                }
+                foreach (var upg in upglist)
+                {
+                    if (upg.ID.Length > maxLength)
+                    {
+                        maxLength = upg.ID.Length;
+                    }
+
+                    upgrades.Add(upg.ID, upg.Cost);
+                }
+
+                foreach (var upg in upgrades)
+                {
+                    Console.WriteLine(Localization.Parse("{SHFM_UPGRADE}", new Dictionary<string, string>
+                    {
+                        ["%id"] = upg.Key,
+                        ["%cost"] = upg.Value.ToString()
+                    }));
+                }
+                return true;
+            }
+            catch (Exception e)
+            {
+                CrashHandler.Start(e);
+                return false;
+            }
+        }
+    }
+
+    public static class WindowCommands
+    {
+        [RemoteLock]
+        [Command("processes", description = "{DESC_PROCESSES}")]
+        public static bool List()
+        {
+            Console.WriteLine("{GEN_CURRENTPROCESSES}");
+            foreach (var app in AppearanceManager.OpenForms)
+            {
+                //Windows are displayed the order in which they were opened.
+                Console.WriteLine($"{AppearanceManager.OpenForms.IndexOf(app)}\t{app.Text}");
+            }
+            return true;
+        }
+
+        [Command("programs", description = "{DESC_PROGRAMS}")]
+        public static bool Programs()
+        {
+            Console.WriteLine("{GEN_PROGRAMS}");
+            Console.WriteLine("===============");
+            Console.WriteLine();
+            foreach(var cmd in TerminalBackend.Commands.Where(x=>x is TerminalBackend.WinOpenCommand && Shiftorium.UpgradeInstalled(x.Dependencies)).OrderBy(x => x.CommandInfo.name))
+            {
+                Console.Write(" - " + cmd.CommandInfo.name);
+                if (!string.IsNullOrWhiteSpace(cmd.CommandInfo.description))
+                    if (Shiftorium.UpgradeInstalled("help_description"))
+                        Console.Write(": " + cmd.CommandInfo.description);
+                Console.WriteLine();
+            }
+            return true;
+        }
+
+        [RemoteLock]
+        [Command("close", usage = "{win:integer32}", description ="{DESC_CLOSE}")]
+        [RequiresArgument("win")]
+        [RequiresUpgrade("close_command")]
+        public static bool CloseWindow(Dictionary<string, object> args)
+        {
+            int winNum = -1;
+            if (args.ContainsKey("win"))
+                winNum = Convert.ToInt32(args["win"].ToString());
+            string err = null;
+
+            if (winNum < 0 || winNum >= AppearanceManager.OpenForms.Count)
+                err = Localization.Parse("{ERR_BADWINID}", new Dictionary<string, string>
+                {
+                    ["%max"] = (AppearanceManager.OpenForms.Count - 1).ToString()
+                });
+
+            if (string.IsNullOrEmpty(err))
+            {
+                Console.WriteLine("{RES_WINDOWCLOSED}");
+                AppearanceManager.Close(AppearanceManager.OpenForms[winNum].ParentWindow);
+            }
+            else
+            {
+                Console.WriteLine(err);
+            }
+
+            return true;
+        }
+
+    }
+}
diff --git a/ShiftOS.Frontend/ShiftOS.Frontend.csproj b/ShiftOS.Frontend/ShiftOS.Frontend.csproj
index 99f2081..6ef27e1 100644
--- a/ShiftOS.Frontend/ShiftOS.Frontend.csproj
+++ b/ShiftOS.Frontend/ShiftOS.Frontend.csproj
@@ -43,6 +43,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Apps\Terminal.cs" />
+    <Compile Include="Commands.cs" />
     <Compile Include="Desktop\Desktop.cs" />
     <Compile Include="Desktop\WindowManager.cs" />
     <Compile Include="GraphicsSubsystem\UIManager.cs" />
@@ -68,6 +69,10 @@
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -127,6 +132,7 @@
       <Link>MonoGame.Framework.dll.config</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="app.config" />
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
@@ -140,6 +146,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\cursor_9x_pointer.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/ShiftOS.Frontend/app.config b/ShiftOS.Frontend/app.config
new file mode 100644
index 0000000..dde2c3c
--- /dev/null
+++ b/ShiftOS.Frontend/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/ShiftOS.Frontend/packages.config b/ShiftOS.Frontend/packages.config
new file mode 100644
index 0000000..ee51c23
--- /dev/null
+++ b/ShiftOS.Frontend/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+</packages>
\ No newline at end of file