diff --git a/MudEngine/Commands/CommandExit.cs b/MudEngine/Commands/CommandExit.cs
index 7a686f1..7957ec1 100644
--- a/MudEngine/Commands/CommandExit.cs
+++ b/MudEngine/Commands/CommandExit.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using System.Text;
 
+using MudEngine.FileSystem;
 using MudEngine.GameObjects.Characters;
 using MudEngine.GameManagement;
 using MudEngine.Commands;
@@ -20,8 +22,12 @@ namespace MudEngine.Commands
             if (player.ActiveGame.IsMultiplayer)
                 player.Disconnect();
             else
+            {
+                //Save the player prior to attempting to shutdown.
+                //Player saving is handled in the server disconnect code but not in game shutdown.
+                player.Save(Path.Combine(player.ActiveGame.DataPaths.Players, player.Filename));
                 player.ActiveGame.Shutdown();
-
+            }
             return new CommandResults();
         }
     }
diff --git a/MudEngine/Commands/CommandLogin.cs b/MudEngine/Commands/CommandLogin.cs
index cbb5977..6a073b6 100644
--- a/MudEngine/Commands/CommandLogin.cs
+++ b/MudEngine/Commands/CommandLogin.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using System.Text;
 
+using MudEngine.FileSystem;
 using MudEngine.GameObjects.Characters;
 using MudEngine.GameManagement;
 using MudEngine.Commands;
@@ -22,37 +24,44 @@ namespace MudEngine.Commands
             player.Send(player.ActiveGame.Story);
             player.Send("");
 
-            bool isLegal = false;
+            player.Send("Enter Character Name: ", false);
+            
+            string input = player.ReadInput();
+            Boolean playerFound = false;
+            string savedFile = "";
 
-            while (!isLegal)
+            //See if this character already exists.
+            foreach (string filename in Directory.GetFiles(player.ActiveGame.DataPaths.Players))
             {
-                player.Send("Enter Character Name: ", false);
-                string input = player.ReadInput();
-                bool foundName = false;
-
-                foreach (BaseCharacter bc in player.ActiveGame.PlayerCollection)
+                if (Path.GetFileNameWithoutExtension(filename).ToLower() == input.ToLower())
                 {
-                    if (bc.Name == input)
-                    {
-                        player.Send("Character name already taken.");
-                        foundName = true;
-                        break;
-                    }
-                }
-
-                if (!foundName)
-                {
-                    if (input == "")
-                        continue;
-                    else
-                    {
-                        isLegal = true;
-                        player.Name = input;
-                    }
+                    //TODO: Ask for password.
+                    savedFile = filename;
+                    playerFound = true;
+                    break;
                 }
             }
 
-            player.Send("Welcome " + player.Name + "!");
+            //Next search if there is an existing player already logged in with this name, if so disconnect them.
+            foreach (BaseCharacter character in player.ActiveGame.PlayerCollection)
+            {
+                if (character.Name.ToLower() == input.ToLower())
+                {
+                    character.Disconnect();
+                }
+            }
+
+            //Now assign this name to this player if this is a new toon or load the player if the file exists.
+            if (!playerFound)
+            {
+                player.Name = input;
+                player.Send("Welcome " + player.Name + "!");
+            }
+            else
+            {
+                player.Load(savedFile);
+                player.Send("Welcome back " + player.Name + "!");
+            }
             player.CommandSystem.ExecuteCommand("Look", player);
             return new CommandResults();
         }
diff --git a/MudEngine/FileSystem/FileManager.cs b/MudEngine/FileSystem/FileManager.cs
index 9b8505d..97dcf4b 100644
--- a/MudEngine/FileSystem/FileManager.cs
+++ b/MudEngine/FileSystem/FileManager.cs
@@ -56,6 +56,10 @@ namespace MudEngine.FileSystem
         {
             foreach (string line in File.ReadAllLines(filename))
             {
+                //Ignore comments
+                if (line.StartsWith(";"))
+                    continue;
+
                 if (line.StartsWith(name))
                     return line.Substring(name.Length + 1); //Accounts for name=value;
             }
diff --git a/MudEngine/GameManagement/Game.cs b/MudEngine/GameManagement/Game.cs
index 56f6c83..85cf690 100644
--- a/MudEngine/GameManagement/Game.cs
+++ b/MudEngine/GameManagement/Game.cs
@@ -20,6 +20,16 @@ using MudEngine.Scripting;
 
 namespace MudEngine.GameManagement
 {
+    
+    #region Custom Types
+        public enum TimeOfDayOptions
+        {
+            AlwaysDay,
+            AlwaysNight,
+            Transition,
+        }
+        #endregion
+
     /// <summary>
     /// Manages all of the projects settings.
     /// </summary>
@@ -28,25 +38,6 @@ namespace MudEngine.GameManagement
     public class Game
     {
         #region ==== Properties & Types ====
-        #region Custom Types
-        public enum TimeOfDayOptions
-        {
-            AlwaysDay,
-            AlwaysNight,
-            Transition,
-        }
-
-        /// <summary>
-        /// Gets or Sets what time of day the world is currently in.
-        /// </summary>
-        [Category("Day Management")]
-        [Description("Set what time of day the world will take place in.")]
-        public TimeOfDayOptions TimeOfDay
-        {
-            get;
-            set;
-        }
-        #endregion
 
         #region Game Object Setup
         /// <summary>
@@ -129,6 +120,13 @@ namespace MudEngine.GameManagement
         /// </summary>
         public bool HideRoomNames { get; set; }
 
+        /// <summary>
+        /// Gets or Sets what time of day the world is currently in.
+        /// </summary>
+        [Category("Day Management")]
+        [Description("Set what time of day the world will take place in.")]
+        public TimeOfDayOptions TimeOfDay { get; set; }
+
         /// <summary>
         /// Gets or Sets how long in minutes it takes to transition from day to night.
         /// </summary>
diff --git a/MudEngine/GameObjects/Characters/BaseCharacter.cs b/MudEngine/GameObjects/Characters/BaseCharacter.cs
index 8623915..cf1fcbf 100644
--- a/MudEngine/GameObjects/Characters/BaseCharacter.cs
+++ b/MudEngine/GameObjects/Characters/BaseCharacter.cs
@@ -89,6 +89,10 @@ namespace MudEngine.GameObjects.Characters
 
         public override void Save(string filename)
         {
+            //Don't attempt to save a blank filename.
+            if (String.IsNullOrEmpty(filename))
+                return;
+
             base.Save(filename);
 
             FileManager.WriteLine(filename, this.IsControlled.ToString(), "IsControlled");
@@ -224,6 +228,7 @@ namespace MudEngine.GameObjects.Characters
                 string filePath =  Path.Combine(ActiveGame.DataPaths.Players, Filename);
                 this.Save(filePath);
 
+                Send("Goodbye!");
                 IsActive = false;
                 client.Close();
 
diff --git a/MudEngine/MudEngine.csproj b/MudEngine/MudEngine.csproj
index 24bf0b2..b66dd88 100644
--- a/MudEngine/MudEngine.csproj
+++ b/MudEngine/MudEngine.csproj
@@ -83,14 +83,8 @@
     <Compile Include="Scripting\GameObject.cs" />
     <Compile Include="Scripting\GameObjectCollection.cs" />
     <Compile Include="Scripting\ScriptEngine.cs" />
-    <Compile Include="Scripting\StartupObject.cs" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <None Include="startup.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MudEngine/Scripting/ScriptEngine.cs b/MudEngine/Scripting/ScriptEngine.cs
index 3f51c38..7a4bb82 100644
--- a/MudEngine/Scripting/ScriptEngine.cs
+++ b/MudEngine/Scripting/ScriptEngine.cs
@@ -11,6 +11,7 @@ using System.IO;
 using System.Text;
 using System.Reflection;
 
+using MudEngine.FileSystem;
 using MudEngine.GameObjects;
 using MudEngine.GameObjects.Characters;
 using MudEngine.GameManagement;
@@ -28,7 +29,19 @@ namespace MudEngine.Scripting
         /// <summary>
         /// Path to the the script files directory
         /// </summary>
-        public string ScriptPath { get; set; }
+        public string ScriptPath
+        {
+            get
+            {
+                return _ScriptPath;
+            }
+            set
+            {
+                _ScriptPath = Path.Combine(FileManager.GetDataPath(SaveDataTypes.Root), value);
+            }
+        }
+        string _ScriptPath;
+
         public string InstallPath { get; private set; }
         public GameObjectCollection ObjectCollection { get; private set; }
 
@@ -89,7 +102,7 @@ namespace MudEngine.Scripting
             ScriptExtension = ".cs";
 
             //Get our current install path
-            ScriptPath = Path.Combine(Environment.CurrentDirectory, "Scripts");
+            ScriptPath = "Scripts";
             InstallPath = Environment.CurrentDirectory;
             GameObjects = new List<GameObject>();
             _AssemblyCollection = new List<Assembly>();
@@ -159,12 +172,13 @@ namespace MudEngine.Scripting
             //Compile the scripts with the C# CodeProvider
             CSharpCodeProvider codeProvider = new CSharpCodeProvider(providerOptions);
             CompilerResults results = new CompilerResults(new TempFileCollection());
-            scripts = Directory.GetFiles(ScriptPath, "*.Mud", SearchOption.AllDirectories);
+            scripts = Directory.GetFiles(ScriptPath, "*" + ScriptExtension, SearchOption.AllDirectories);
             results = codeProvider.CompileAssemblyFromFile(param, scripts);
 
             //Delete the temp folder
             //Directory.Delete("temp", true);
             ScriptPath = oldPath;
+            _ScriptAssembly = results.CompiledAssembly;
 
             //if we encountered errors we need to log them to our ErrorMessages property
             if (results.Errors.Count >= 1)
@@ -224,6 +238,11 @@ namespace MudEngine.Scripting
                         Log.Write(t.Name + " script loaded.");
                         continue;
                     }
+                    else if (t.BaseType.Name == "Game")
+                    {
+                        GameObject obj = new GameObject(Activator.CreateInstance(t, null), t.Name);
+                        GameObjects.Add(obj);
+                    }
                 }
             }
         }
@@ -253,7 +272,16 @@ namespace MudEngine.Scripting
 
         private void InitializeSourceFiles()
         {
-            Log.Write("Source file scripts is not supported! Please change the script engine settings to load pre-compiled Assemblies!");
+            string[] scripts = Directory.GetFiles(ScriptPath, "*.cs", SearchOption.AllDirectories);
+
+            if (scripts.Length == 0)
+            {
+                Log.Write("No un-compiled scripts located!");
+                return;
+            }
+
+            CompileScripts();
+            _AssemblyCollection.Add(_ScriptAssembly);
         }
 
         public GameObject GetObject(string objectName)
@@ -271,5 +299,16 @@ namespace MudEngine.Scripting
 
             return null;
         }
+
+        public GameObject GetObjectOf(string baseTypeName)
+        {
+            foreach (GameObject obj in GameObjects)
+            {
+                if (obj.Instance.GetType().BaseType.Name == baseTypeName)
+                    return obj;
+            }
+
+            return null;
+        }
     }
 }
diff --git a/MudEngine/Scripting/StartupObject.cs b/MudEngine/Scripting/StartupObject.cs
deleted file mode 100644
index 5df0236..0000000
--- a/MudEngine/Scripting/StartupObject.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudEngine.Scripting
-{
-    public class StartupObject
-    {
-        public StartupObject()
-        {
-        }
-    }
-}
diff --git a/MudEngine/startup.dat b/MudEngine/startup.dat
deleted file mode 100644
index 85972ef..0000000
--- a/MudEngine/startup.dat
+++ /dev/null
@@ -1 +0,0 @@
-PlayerClass=P
\ No newline at end of file
diff --git a/MudOfflineExample/Program.cs b/MudOfflineExample/Program.cs
index 8a81069..161ed3b 100644
--- a/MudOfflineExample/Program.cs
+++ b/MudOfflineExample/Program.cs
@@ -27,7 +27,7 @@ namespace MUDGame
             game.HideRoomNames = false;
             game.PreCacheObjects = true;
             game.ProjectPath = FileManager.GetDataPath(SaveDataTypes.Root);
-            game.TimeOfDay = Game.TimeOfDayOptions.Transition;
+            game.TimeOfDay = TimeOfDayOptions.Transition;
             game.TimeOfDayTransition = 30;
             game.Version = "0.1";
             game.Website = "http://MudDesigner.Codeplex.com";
diff --git a/MudServer/..svnbridge/.svnbridge b/MudServer/..svnbridge/.svnbridge
index 25ee1ea..bc15627 100644
--- a/MudServer/..svnbridge/.svnbridge
+++ b/MudServer/..svnbridge/.svnbridge
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:ignore</Name><Value>obj
+</Value></Property><Property><Name>svn:ignore</Name><Value>obj
+Settings.ini
 </Value></Property></Properties></ItemProperties>
\ No newline at end of file
diff --git a/MudServer/MudServer.csproj b/MudServer/MudServer.csproj
index 8e8a5bd..9049c1d 100644
--- a/MudServer/MudServer.csproj
+++ b/MudServer/MudServer.csproj
@@ -55,6 +55,11 @@
       <Name>MudEngine</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Settings.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MudServer/Program.cs b/MudServer/Program.cs
index 59b2d58..10cb477 100644
--- a/MudServer/Program.cs
+++ b/MudServer/Program.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using System.Net.Sockets;
 using System.Text;
 
 using MudEngine.FileSystem;
 using MudEngine.GameManagement;
 using MudEngine.GameObjects.Characters;
+using MudEngine.Scripting;
 using MUDGame; //Pulling this from the example game, no sense re-writing what already exists.
 
 namespace MudServer
@@ -15,6 +17,46 @@ namespace MudServer
     {
         static void Main(string[] args)
         {
+            ScriptEngine scriptEngine;
+            Game game;
+
+            //Re-create the settings file if it is missing
+            if (!File.Exists("Settings.ini"))
+            {
+                Log.Write("Settings.ini missing!");
+                FileManager.WriteLine("Settings.ini", "Scripts", "ScriptPath");
+                FileManager.WriteLine("Settings.ini", ".cs", "ScriptExtension");
+            }
+
+            scriptEngine = new ScriptEngine(new Game(), ScriptEngine.ScriptTypes.SourceFiles);
+            scriptEngine.ScriptPath = FileManager.GetData("Settings.ini", "ScriptPath");
+            scriptEngine.ScriptExtension = FileManager.GetData("Settings.ini", "ScriptExtension");
+
+            //scriptEngine.CompileScripts();
+
+            scriptEngine.Initialize();
+
+            GameObject obj = scriptEngine.GetObjectOf("Game");
+
+            if (obj == null)
+            {
+                game = new Game();
+                obj = new GameObject(game, "Game");
+                scriptEngine = new ScriptEngine((Game)obj.Instance, ScriptEngine.ScriptTypes.Assembly);
+            }
+            else
+            {
+                game = (Game)obj.Instance;
+                scriptEngine = new ScriptEngine(game, ScriptEngine.ScriptTypes.Assembly);
+            }
+
+            scriptEngine.Initialize();
+
+            Console.WriteLine(game.GameTitle);
+            Console.ReadKey();
+                
+
+            /*
             Game game = new Game();
             Zeroth realm = new Zeroth(game);
             
@@ -42,13 +84,13 @@ namespace MudServer
             Game.IsDebug = false;
 
             game.Start();
-
+            
             while (game.IsRunning)
             {
                 Console.Write(Log.GetMessages());
                 Log.FlushMessages();
                 System.Threading.Thread.Sleep(1);
-            }
+            */
         }
     }
 }
diff --git a/MudServer/bin/Debug/..svnbridge/.svnbridge b/MudServer/bin/Debug/..svnbridge/.svnbridge
index 760e94f..f18b75f 100644
--- a/MudServer/bin/Debug/..svnbridge/.svnbridge
+++ b/MudServer/bin/Debug/..svnbridge/.svnbridge
@@ -6,4 +6,16 @@ MudServer.pdb
 MudServer.vshost.exe
 MudServer.vshost.exe.manifest
 startup.dat
+</Value></Property><Property><Name>svn:ignore</Name><Value>Log.txt
+MudEngine.dll
+MudEngine.pdb
+MudServer.exe
+MudServer.pdb
+MudServer.vshost.exe
+MudServer.vshost.exe.manifest
+Player
+Scripts.dll
+Settings.ini
+startup.dat
+temp
 </Value></Property></Properties></ItemProperties>
\ No newline at end of file
diff --git a/MudServer/bin/Debug/Scripts/..svnbridge/Scripts.dll b/MudServer/bin/Debug/Scripts/..svnbridge/Scripts.dll
deleted file mode 100644
index 0814930..0000000
--- a/MudServer/bin/Debug/Scripts/..svnbridge/Scripts.dll
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:mime-type</Name><Value>application/octet-stream</Value></Property></Properties></ItemProperties>
\ No newline at end of file
diff --git a/MudServer/bin/Debug/Scripts/MyGame.cs b/MudServer/bin/Debug/Scripts/MyGame.cs
new file mode 100644
index 0000000..d7abfce
--- /dev/null
+++ b/MudServer/bin/Debug/Scripts/MyGame.cs
@@ -0,0 +1,7 @@
+public class MyGame : Game
+{
+    public MyGame() :base()
+    {
+        GameTitle = "Mud Designer Demo Game";
+    }
+}
\ No newline at end of file
diff --git a/MudServer/bin/Debug/Scripts/Scripts.dll b/MudServer/bin/Debug/Scripts/Scripts.dll
deleted file mode 100644
index 6658919..0000000
Binary files a/MudServer/bin/Debug/Scripts/Scripts.dll and /dev/null differ