VOID_HUD: downrangeDistance: Added null gates at fallback.
VOID_HUD: downrangeDistance: Added null gates at fallback.

--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("0.11.0.*")]
+[assembly: AssemblyVersion("0.14.2.*")]
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
 //[assembly: AssemblyDelaySign(false)]

--- a/VOID.csproj
+++ b/VOID.csproj
@@ -9,6 +9,7 @@
     <RootNamespace>VOID</RootNamespace>
     <AssemblyName>VOID</AssemblyName>
     <CodePage>65001</CodePage>
+    <UseMSBuildEngine>False</UseMSBuildEngine>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ReleaseVersion>0.11</ReleaseVersion>
@@ -94,7 +95,8 @@
     <Compile Include="VOID_Localization.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VOID_HUDAdvanced.cs" />
-    <Compile Include="VOID_EditorTWR.cs" />
+    <Compile Include="VOID_TWR.cs" />
+    <Compile Include="VOID_CareerStatus.cs" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>

--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -51,6 +51,9 @@
 		[AVOID_SaveValue("togglePhysical")]
 		protected VOID_SaveValue<bool> togglePhysical = false;
 
+		[AVOID_SaveValue("toggleScience")]
+		protected VOID_SaveValue<bool> toggleScience = false;
+
 		public VOID_CBInfoBrowser()
 		{
 			this._Name = "Celestial Body Information Browser";
@@ -72,20 +75,20 @@
 
 			GUILayout.BeginVertical(GUILayout.Width(150));
 
-			selectedBody1 = VOID_Core.Instance.allBodies[selectedBodyIdx1];
-			selectedBody2 = VOID_Core.Instance.allBodies[selectedBodyIdx2];
+			selectedBody1 = this.core.allBodies[selectedBodyIdx1];
+			selectedBody2 = this.core.allBodies[selectedBodyIdx2];
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			if (GUILayout.Button("<", GUILayout.ExpandWidth(false)))
 			{
 				selectedBodyIdx1--;
-				if (selectedBodyIdx1 < 0) selectedBodyIdx1 = VOID_Core.Instance.allBodies.Count - 1;
-			}
-			GUILayout.Label(VOID_Core.Instance.allBodies[selectedBodyIdx1].bodyName, VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
+				if (selectedBodyIdx1 < 0) selectedBodyIdx1 = this.core.allBodies.Count - 1;
+			}
+			GUILayout.Label(this.core.allBodies[selectedBodyIdx1].bodyName, this.core.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
 			if (GUILayout.Button(">", GUILayout.ExpandWidth(false)))
 			{
 				selectedBodyIdx1++;
-				if (selectedBodyIdx1 > VOID_Core.Instance.allBodies.Count - 1) selectedBodyIdx1 = 0;
+				if (selectedBodyIdx1 > this.core.allBodies.Count - 1) selectedBodyIdx1 = 0;
 			}
 			GUILayout.EndHorizontal();
 			GUILayout.EndVertical();
@@ -95,13 +98,13 @@
 			if (GUILayout.Button("<", GUILayout.ExpandWidth(false)))
 			{
 				selectedBodyIdx2--;
-				if (selectedBodyIdx2 < 0) selectedBodyIdx2 = VOID_Core.Instance.allBodies.Count - 1;
-			}
-			GUILayout.Label(VOID_Core.Instance.allBodies[selectedBodyIdx2].bodyName, VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
+				if (selectedBodyIdx2 < 0) selectedBodyIdx2 = this.core.allBodies.Count - 1;
+			}
+			GUILayout.Label(this.core.allBodies[selectedBodyIdx2].bodyName, this.core.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
 			if (GUILayout.Button(">", GUILayout.ExpandWidth(false)))
 			{
 				selectedBodyIdx2++;
-				if (selectedBodyIdx2 > VOID_Core.Instance.allBodies.Count - 1) selectedBodyIdx2 = 0;
+				if (selectedBodyIdx2 > this.core.allBodies.Count - 1) selectedBodyIdx2 = 0;
 			}
 			GUILayout.EndHorizontal();
 			GUILayout.EndVertical();
@@ -208,87 +211,153 @@
 				GUILayout.EndHorizontal();
 			}
 
+			if (GUILayout.Button("Scientific Parameters", GUILayout.ExpandWidth(true)))
+			{
+				toggleScience.value = !toggleScience;
+			}
+
+			if (toggleScience)
+			{
+				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+				//begin physical info value label column
+				GUILayout.BeginVertical(GUILayout.Width(150));
+
+
+				/*
+				 *  public float RecoveryValue = 1f;
+
+					public float InSpaceHighDataValue = 1f;
+
+					public float spaceAltitudeThreshold = 250000f;
+
+					public float flyingAltitudeThreshold = 18000f;
+
+					public float InSpaceLowDataValue = 1f;
+
+					public float SplashedDataValue = 1f;
+
+					public float LandedDataValue = 1f;
+
+					public float FlyingHighDataValue = 1f;
+
+					public float FlyingLowDataValue = 1f;
+					*/
+
+				GUILayout.Label("Surface Multiplier:");
+				GUILayout.Label("Ocean Multiplier:");
+				GUILayout.Label("Flying-Low Multiplier:");
+				GUILayout.Label("Flying-High Multiplier:");
+				GUILayout.Label("Low Orbit Multiplier:");
+				GUILayout.Label("High Orbit Multiplier:");
+				GUILayout.Label("'Flying-High' Altitude:");
+				GUILayout.Label("'High Orbit' Altitude:");
+				GUILayout.Label("Recovery Multiplier:");
+
+				//end physical info value label column
+				GUILayout.EndVertical();
+
+				//begin primary physical values column
+				GUILayout.BeginVertical(GUILayout.Width(150));
+
+				this.cbColumnScience(selectedBody1);
+
+				//end primary physical column
+				GUILayout.EndVertical();
+
+				//begin secondary physical values column
+				GUILayout.BeginVertical(GUILayout.Width(150));
+
+				this.cbColumnScience(selectedBody2);
+
+				//end target physical values column
+				GUILayout.EndVertical();
+
+				//end physical value horizontal chunk
+				GUILayout.EndHorizontal();
+			}
+
 			GUI.DragWindow();
 		}
 
 		private void body_OP_show_orbital_info(CelestialBody body)
 		{
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToAp), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToPe), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.period), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.rotationPeriod), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			// Toadicus edit: convert mean anomaly into degrees.
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			// Toadicus edit: convert eccentric anomaly into degrees.
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else
 		    {
 		        string body_tidally_locked = "No";
 		        if (body.tidallyLocked) body_tidally_locked = "Yes";
-		        GUILayout.Label(body_tidally_locked, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		        GUILayout.Label(body_tidally_locked, this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    }
 		}
 
 		private void body_OP_show_physical_info(CelestialBody body)
 		{
 
-			GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-			GUILayout.Label((((body.Radius * body.Radius) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+			GUILayout.Label((((body.Radius * body.Radius) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			// divide by 1000 to convert m to km
-			GUILayout.Label((((4d / 3) * Math.PI * (body.Radius * body.Radius * body.Radius)) / 1000).ToString("0.00e+00") + "km³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-			GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			GUILayout.Label((((4d / 3) * Math.PI * (body.Radius * body.Radius * body.Radius)) / 1000).ToString("0.00e+00") + "km³", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			double p = body.Mass / ((body.Radius * body.Radius * body.Radius) * (4d / 3) * Math.PI);
 
-			GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-			if (body.bodyName == "Sun") GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-			GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(p.ToString("##,#") + "kg/m³", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+			if (body.bodyName == "Sun") GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(body.orbitingBodies.Count.ToString(), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			//show # artificial satellites
 			int num_art_sats = 0;
@@ -297,31 +366,87 @@
 				if (v.mainBody == body && v.situation.ToString() == "ORBITING") num_art_sats++;
 			}
 
-			GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(num_art_sats.ToString(), this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			double g_ASL = (VOID_Core.Constant_G * body.Mass) / (body.Radius * body.Radius);
 
-			GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			if (body.atmosphere)
 			{
 				GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m",
-					VOID_Core.Instance.LabelStyles["right"],
+					this.core.LabelStyles["right"],
 					GUILayout.ExpandWidth(true));
 
 				string O2 = "No";
 				if (body.atmosphereContainsOxygen == true) O2 = "Yes";
-				GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+				GUILayout.Label(O2, this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 			}
 			else
 			{
-				GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-				GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+				GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+				GUILayout.Label("N/A", this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
 			}
 
 			string ocean = "No";
 			if (body.ocean == true) ocean = "Yes";
-			GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(ocean, this.core.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		}
+
+		private void cbColumnScience(CelestialBody body)
+		{
+			/*GUILayout.Label("Surface Science Multiplier:");
+			GUILayout.Label("Ocean Science Multiplier:");
+			GUILayout.Label("Low-Atmosphere Science Multiplier:");
+			GUILayout.Label("High-Atmosphere Science Multiplier:");
+			GUILayout.Label("Low Orbit Science Multiplier:");
+			GUILayout.Label("High Orbit Science Multiplier:");
+			GUILayout.Label("'In Space' Altitude:");
+			GUILayout.Label("'Flying' Altitude:");
+			GUILayout.Label("Recovery Multiplier:");*/
+
+			var scienceValues = body.scienceValues;
+
+			GUILayout.Label(scienceValues.LandedDataValue.ToString("0.0#"),
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.ocean ? scienceValues.SplashedDataValue.ToString("0.0#") : "N/A",
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.atmosphere ? scienceValues.FlyingLowDataValue.ToString("0.0#") : "N/A",
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.atmosphere ? scienceValues.FlyingHighDataValue.ToString("0.0#") : "N/A",
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(scienceValues.InSpaceLowDataValue.ToString("0.0#"),
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(scienceValues.InSpaceHighDataValue.ToString("0.0#"),
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.atmosphere ? scienceValues.flyingAltitudeThreshold.ToString("N0") : "N/A",
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				scienceValues.spaceAltitudeThreshold.ToString("N0"),
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(scienceValues.RecoveryValue.ToString("0.0#"),
+				this.core.LabelStyles["right"],
+				GUILayout.ExpandWidth(true));
 		}
 	}
 }

--- /dev/null
+++ b/VOID_CareerStatus.cs
@@ -1,1 +1,292 @@
-
+// VOID
+//
+// VOID_CareerStatus.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using KSP;
+using System;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public class VOID_CareerStatus : VOID_WindowModule
+	{
+		public static VOID_CareerStatus Instance
+		{
+			get;
+			private set;
+		}
+
+		public static string formatDelta(double delta)
+		{
+			if (delta > 0)
+			{
+				return string.Format("<color='green'>{0:#,#.##}↑</color>", delta);
+			}
+			else if (delta < 0)
+			{
+				return string.Format("<color='red'>{0:#,#.##}↓</color>", delta);
+			}
+			else
+			{
+				return string.Intern("0");
+			}
+		}
+
+		public static string formatDelta(float delta)
+		{
+			return formatDelta((double)delta);
+		}
+
+		private GUIContent fundsContent;
+		private GUIContent repContent;
+		private GUIContent scienceContent;
+
+		private Texture2D fundsIconGreen;
+		private Texture2D fundsIconRed;
+		private Texture2D reputationIconGreen;
+		private Texture2D reputationIconRed;
+		private Texture2D scienceIcon;
+
+		public override bool toggleActive
+		{
+			get
+			{
+				switch (HighLogic.CurrentGame.Mode)
+				{
+					case Game.Modes.CAREER:
+					case Game.Modes.SCIENCE_SANDBOX:
+						return base.toggleActive;
+					default:
+						return false;
+				}
+			}
+			set
+			{
+				switch (HighLogic.CurrentGame.Mode)
+				{
+					case Game.Modes.CAREER:
+					case Game.Modes.SCIENCE_SANDBOX:
+						base.toggleActive = value;
+						break;
+					default:
+						return;
+				}
+			}
+		}
+
+		public double lastFundsChange
+		{
+			get;
+			private set;
+		}
+
+		public float lastRepChange
+		{
+			get;
+			private set;
+		}
+
+		public float lastScienceChange
+		{
+			get;
+			private set;
+		}
+
+		public double currentFunds
+		{
+			get;
+			private set;
+		}
+
+		public float currentReputation
+		{
+			get;
+			private set;
+		}
+
+		public float currentScience
+		{
+			get;
+			private set;
+		}
+
+		public override void ModuleWindow(int _)
+		{
+			GUILayout.BeginVertical();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(VOID_Data.fundingStatus.Label);
+			GUILayout.FlexibleSpace();
+			this.fundsContent.text = VOID_Data.fundingStatus.Value;
+			GUILayout.Label(this.fundsContent, GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(VOID_Data.reputationStatus.Label);
+			GUILayout.FlexibleSpace();
+			this.repContent.text = VOID_Data.reputationStatus.Value;
+			GUILayout.Label(this.repContent, GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(VOID_Data.scienceStatus.Label);
+			GUILayout.FlexibleSpace();
+			this.scienceContent.text = VOID_Data.scienceStatus.Value;
+			GUILayout.Label(this.scienceContent, GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+
+			GUILayout.EndVertical();
+
+			GUI.DragWindow();
+		}
+
+		// TODO: Update event handlers to do something useful with the new "reasons" parameter.
+		private void onFundsChange(double newValue, TransactionReasons reasons)
+		{
+			this.lastFundsChange = newValue - this.currentFunds;
+			this.currentFunds = newValue;
+		}
+
+		private void onRepChange(float newValue, TransactionReasons reasons)
+		{
+			this.lastRepChange = newValue - this.currentReputation;
+			this.currentReputation = newValue;
+		}
+
+		private void onScienceChange(float newValue, TransactionReasons reasons)
+		{
+			this.lastScienceChange = newValue - this.currentScience;
+			this.currentScience = newValue;
+		}
+
+		/*
+		 *  MissionRecoveryDialog::fundsIconGreen.name: UiElements_05
+         *  MissionRecoveryDialog::fundsIconRed.name: UiElements_06
+         *  MissionRecoveryDialog::reputationIconGreen.name: UiElements_07
+         *  MissionRecoveryDialog::reputationIconRed.name: UiElements_08
+         *  MissionRecoveryDialog::scienceIcon.name: UiElements_12
+		 * */
+		public VOID_CareerStatus() : base()
+		{
+			VOID_CareerStatus.Instance = this;
+
+			this._Name = "Career Status";
+
+			GameEvents.OnFundsChanged.Add(this.onFundsChange);
+			GameEvents.OnReputationChanged.Add(this.onRepChange);
+			GameEvents.OnScienceChanged.Add(this.onScienceChange);
+
+			bool texturesLoaded;
+
+			texturesLoaded = IOTools.LoadTexture(out this.fundsIconGreen, "VOID/Textures/fundsgreen.png", 10, 18);
+			texturesLoaded &= IOTools.LoadTexture(out this.fundsIconRed, "VOID/Textures/fundsred.png", 10, 18);
+			texturesLoaded &= IOTools.LoadTexture(out this.reputationIconGreen, "VOID/Textures/repgreen.png", 16, 18);
+			texturesLoaded &= IOTools.LoadTexture(out this.reputationIconRed, "VOID/Textures/repred.png", 16, 18);
+			texturesLoaded &= IOTools.LoadTexture(out this.scienceIcon, "VOID/Textures/science.png", 16, 18);
+
+			this.fundsContent = new GUIContent();
+			this.repContent = new GUIContent();
+			this.scienceContent = new GUIContent();
+
+			if (texturesLoaded)
+			{
+				this.fundsContent.image = this.fundsIconGreen;
+				this.repContent.image = this.reputationIconGreen;
+				this.scienceContent.image = this.scienceIcon;
+			}
+
+			this.currentFunds = Funding.Instance != null ? Funding.Instance.Funds : double.NaN;
+			this.currentReputation = Reputation.Instance != null ? Reputation.Instance.reputation : float.NaN;
+			this.currentScience = ResearchAndDevelopment.Instance != null ?
+				ResearchAndDevelopment.Instance.Science : float.NaN;
+		}
+
+		~VOID_CareerStatus()
+		{
+			GameEvents.OnFundsChanged.Remove(this.onFundsChange);
+			GameEvents.OnReputationChanged.Remove(this.onRepChange);
+			GameEvents.OnScienceChanged.Remove(this.onScienceChange);
+
+			VOID_CareerStatus.Instance = null;
+		}
+	}
+
+	public static partial class VOID_Data
+	{
+		public static readonly VOID_StrValue fundingStatus = new VOID_StrValue(
+			string.Intern("Funds"),
+			delegate()
+		{
+			if (VOID_CareerStatus.Instance == null)
+			{
+				return string.Empty;
+			}
+
+			return string.Format("{0} ({1})",
+				VOID_CareerStatus.Instance.currentFunds.ToString("#,#.##"),
+				VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastFundsChange)
+			);
+		}
+		);
+
+		public static readonly VOID_StrValue reputationStatus = new VOID_StrValue(
+			string.Intern("Reputation"),
+			delegate()
+		{
+			if (VOID_CareerStatus.Instance == null)
+			{
+				return string.Empty;
+			}
+
+			return string.Format("{0} ({1})",
+				VOID_CareerStatus.Instance.currentReputation.ToString("#,#.##"),
+				VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastRepChange)
+			);
+		}
+		);
+
+		public static readonly VOID_StrValue scienceStatus = new VOID_StrValue(
+			string.Intern("Science"),
+			delegate()
+		{
+			if (VOID_CareerStatus.Instance == null)
+			{
+				return string.Empty;
+			}
+
+			return string.Format("{0} ({1})",
+				VOID_CareerStatus.Instance.currentScience.ToString("#,#.##"),
+				VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastScienceChange)
+			);
+		}
+		);
+	}
+}
+
+

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -31,6 +31,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using ToadicusTools;
 using UnityEngine;
 
@@ -70,18 +71,19 @@
 		public static void Reset()
 		{
 			_instance.StopGUI();
+			_instance.Dispose();
 			_instance = null;
 			_initialized = false;
 		}
 		#endregion
 
-		public static double Constant_G = 6.674e-11;
+		public static readonly double Constant_G = 6.674e-11;
 
 		/*
 		 * Fields
 		 * */
 		protected string VoidName = "VOID";
-		protected string VoidVersion = "0.11.0";
+		protected string VoidVersion;
 
 		protected bool _factoryReset = false;
 
@@ -175,6 +177,8 @@
 		protected VOID_SaveValue<bool> _UseToolbarManager;
 		internal IButton ToolbarButton;
 
+		internal ApplicationLauncherButton AppLauncherButton;
+
 		/*
 		 * Properties
 		 * */
@@ -281,6 +285,18 @@
 			}
 		}
 
+		public Stage[] Stages
+		{
+			get;
+			protected set;
+		}
+
+		public Stage LastStage
+		{
+			get;
+			protected set;
+		}
+
 		protected IconState powerState
 		{
 			get
@@ -333,10 +349,24 @@
 				}
 				if (value == true)
 				{
+					if (this.AppLauncherButton != null)
+					{
+						ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+						this.AppLauncherButton = null;
+					}
+
 					this.InitializeToolbarButton();
 				}
 
 				_UseToolbarManager.value = value;
+			}
+		}
+
+		protected virtual ApplicationLauncher.AppScenes appIconVisibleScenes
+		{
+			get
+			{
+				return ApplicationLauncher.AppScenes.FLIGHT;
 			}
 		}
 
@@ -362,17 +392,33 @@
 			if (!this.GUIStylesLoaded)
 			{
 				this.LoadGUIStyles();
+
+				Tools.PostDebugMessage(
+					this,
+					"ToolbarAvailable: {0}, UseToobarManager: {1}",
+					ToolbarManager.ToolbarAvailable,
+					this.UseToolbarManager);
 			}
 
 			if (!this.UseToolbarManager)
 			{
-				if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
-				{
-					this.ToggleMainWindow();
+				if (this.AppLauncherButton == null)
+				{
+					Tools.PostDebugMessage(this,
+						"UseToolbarManager = false (ToolbarAvailable = {0}) and " +
+						"AppLauncherButton is null, making AppLauncher button.",
+						ToolbarManager.ToolbarAvailable
+					);
+					this.InitializeAppLauncherButton();
 				}
 			}
 			else if (this.ToolbarButton == null)
 			{
+				Tools.PostDebugMessage(this,
+					"UseToolbarManager = true (ToolbarAvailable = {0}) and " +
+					"ToolbarButton is null, making Toolbar button.",
+					ToolbarManager.ToolbarAvailable
+				);
 				this.InitializeToolbarButton();
 			}
 
@@ -384,7 +430,7 @@
 				_mainWindowPos = GUILayout.Window(
 					this.windowID,
 					_mainWindowPos,
-					this.VOIDMainWindow,
+					VOID_Tools.GetWindowHandler(this.VOIDMainWindow),
 					string.Join(" ", new string[] { this.VoidName, this.VoidVersion }),
 					GUILayout.Width(250),
 					GUILayout.Height(50)
@@ -405,7 +451,7 @@
 				_configWindowPos = GUILayout.Window(
 					this.windowID,
 					_configWindowPos,
-					this.VOIDConfigWindow,
+					VOID_Tools.GetWindowHandler(this.VOIDConfigWindow),
 					string.Join(" ", new string[] { this.VoidName, "Configuration" }),
 					GUILayout.Width(250),
 					GUILayout.Height(50)
@@ -420,7 +466,7 @@
 			}
 		}
 
-		public void OnGUI()
+		public virtual void OnGUI()
 		{
 			if (Event.current.type == EventType.Repaint)
 			{
@@ -474,20 +520,14 @@
 			}
 		}
 
-		public void Update()
+		public virtual void Update()
 		{
 			this.LoadBeforeUpdate();
 
 			if (this.vessel != null && this.vesselSimActive)
 			{
-				double radius = VOID_Core.Instance.vessel.Radius();
-				SimManager.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-					(radius * radius);
-				SimManager.TryStartSimulation();
-			}
-			else if (!this.vesselSimActive)
-			{
-				SimManager.ClearResults();
+				Tools.PostDebugMessage(this, "Updating SimManager.");
+				this.UpdateSimManager();
 			}
 
 			if (!this.guiRunning)
@@ -524,7 +564,7 @@
 			this._updateTimer += Time.deltaTime;
 		}
 
-		public void FixedUpdate()
+		public virtual void FixedUpdate()
 		{
 			bool newPowerState = this.powerAvailable;
 
@@ -694,7 +734,7 @@
 				this.stringFrequency = (1f / this.updatePeriod).ToString();
 			}
 			this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
-			// GUILayout.FlexibleSpace();
+
 			if (GUILayout.Button("Apply"))
 			{
 				double updateFreq = 1f / this.updatePeriod;
@@ -711,45 +751,89 @@
 			this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
 		}
 
+		protected void UpdateSimManager()
+		{
+			if (SimManager.ResultsReady())
+			{
+				Tools.PostDebugMessage(this, "VesselSimulator results ready, setting Stages.");
+
+				this.Stages = SimManager.Stages;
+
+				if (this.Stages != null)
+				{
+					this.LastStage = this.Stages.Last();
+				}
+
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					SimManager.Gravity = VOID_Data.KerbinGee;
+				}
+				else
+				{
+					double radius = this.vessel.Radius();
+					SimManager.Gravity = this.vessel.mainBody.gravParameter / (radius * radius);
+				}
+
+				SimManager.minSimTime = (long)(this.updatePeriod * 1000);
+
+				SimManager.TryStartSimulation();
+			}
+			#if DEBUG
+			else
+			{
+				Tools.PostDebugMessage(this, "VesselSimulator results not ready.");
+			}
+			#endif
+		}
+
 		protected void LoadModulesOfType<T>()
 		{
-			var types = AssemblyLoader.loadedAssemblies
-				.Select(a => a.assembly.GetExportedTypes())
-				.SelectMany(t => t)
-				.Where(v => typeof(T).IsAssignableFrom(v)
-					&& !(v.IsInterface || v.IsAbstract) &&
-					!typeof(VOID_Core).IsAssignableFrom(v)
-				);
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Found {1} modules to check.",
-				this.GetType().Name,
-				types.Count()
-			));
-			foreach (var voidType in types)
-			{
-				if (!HighLogic.LoadedSceneIsEditor &&
-					typeof(IVOID_EditorModule).IsAssignableFrom(voidType))
-				{
-					continue;
-				}
-
-				Tools.PostDebugMessage(string.Format(
-					"{0}: found Type {1}",
-					this.GetType().Name,
-					voidType.Name
-				));
-
-				this.LoadModule(voidType);
+			StringBuilder sb = new StringBuilder("Loading modules...");
+			sb.AppendLine();
+
+			foreach (AssemblyLoader.LoadedAssembly assy in AssemblyLoader.loadedAssemblies)
+			{
+				foreach (Type loadedType in assy.assembly.GetExportedTypes())
+				{
+					if (
+						loadedType.IsInterface ||
+						loadedType.IsAbstract ||
+						!typeof(T).IsAssignableFrom(loadedType) ||
+						this.GetType().IsAssignableFrom(loadedType)
+					)
+					{
+						continue;
+					}
+
+					// HACK: This stops editor modules from loading in flight.  It is a dirty hack and should be fixed.
+					if (!HighLogic.LoadedSceneIsEditor && typeof(IVOID_EditorModule).IsAssignableFrom(loadedType))
+					{
+						continue;
+					}
+
+					sb.AppendFormat("Loading IVOID_Module type {0}...", loadedType.Name);
+
+					try
+					{
+						this.LoadModule(loadedType);
+						sb.AppendLine("Success.");
+					}
+					catch (Exception ex)
+					{
+						sb.AppendFormat("Failed, caught {0}", ex.GetType().Name);
+						sb.AppendLine();
+
+						#if DEBUG
+						Debug.LogException(ex);
+						#endif
+					}
+				}
 			}
 
 			this._modulesLoaded = true;
 
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Loaded {1} modules.",
-				this.GetType().Name,
-				this.Modules.Count
-			));
+			sb.AppendFormat("Loaded {0} modules.", this.Modules.Count);
+			sb.AppendLine();
 		}
 
 		protected void LoadModule(Type T)
@@ -857,10 +941,7 @@
 
 			this.iconStyle = new GUIStyle(GUI.skin.button);
 			this.iconStyle.padding = new RectOffset(0, 0, 0, 0);
-			// this.iconStyle.margin = new RectOffset(0, 0, 0, 0);
-			// this.iconStyle.contentOffset = new Vector2(0, 0);
 			this.iconStyle.overflow = new RectOffset(0, 0, 0, 0);
-			// this.iconStyle.border = new RectOffset(0, 0, 0, 0);
 
 			this.GUIStylesLoaded = true;
 		}
@@ -881,9 +962,10 @@
 
 		protected void InitializeToolbarButton()
 		{
-			// Do nothing if the Toolbar is not available.
+			// Do nothing if (the Toolbar is not available.
 			if (!ToolbarManager.ToolbarAvailable)
 			{
+				Tools.PostDebugMessage(this, "Refusing to make a ToolbarButton: ToolbarAvailable = false");
 				return;
 			}
 
@@ -900,6 +982,27 @@
 			};
 
 			Tools.PostDebugMessage(string.Format("{0}: Toolbar Button initialized.", this.GetType().Name));
+		}
+
+		protected void InitializeAppLauncherButton()
+		{
+			if (ApplicationLauncher.Ready)
+			{
+				this.AppLauncherButton = ApplicationLauncher.Instance.AddModApplication(
+					this.ToggleMainWindow, this.ToggleMainWindow,
+					this.appIconVisibleScenes,
+					this.VOIDIconTexture
+				);
+
+				Tools.PostDebugMessage(
+					this,
+					"AppLauncherButton initialized in {0}",
+					Enum.GetName(
+						typeof(GameScenes),
+						HighLogic.LoadedScene
+					)
+				);
+			}
 		}
 
 		protected void ToggleMainWindow()
@@ -936,7 +1039,12 @@
 				this.ToolbarButton.TexturePath = texturePath;
 			}
 
-			this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
+			this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath.Replace("icon", "appIcon"), false);
+
+			if (this.AppLauncherButton != null)
+			{
+				this.AppLauncherButton.SetTexture(VOIDIconTexture);
+			}
 		}
 
 		protected void CheckAndSave()
@@ -992,7 +1100,11 @@
 		{
 			this._Name = "VOID Core";
 
-			this._Active.value = true;
+			System.Version version = this.GetType().Assembly.GetName().Version;
+
+			this.VoidVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.MajorRevision);
+
+			this.toggleActive = true;
 
 			this._skinName = this.defaultSkin;
 			this._skinIdx = int.MinValue;
@@ -1011,6 +1123,20 @@
 			this.SetIconTexture(this.powerState | this.activeState);
 		}
 
+		public virtual void Dispose()
+		{
+			if (this.AppLauncherButton != null)
+			{
+				ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+				this.AppLauncherButton = null;
+			}
+			if (this.ToolbarButton != null)
+			{
+				this.ToolbarButton.Destroy();
+				this.ToolbarButton = null;
+			}
+		}
+
 		protected enum IconState
 		{
 			PowerOff = 1,
@@ -1026,7 +1152,14 @@
 		{
 			get
 			{
-				return VOID_Core.Instance;
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					return VOID_EditorCore.Instance;
+				}
+				else
+				{
+					return VOID_Core.Instance;
+				}
 			}
 		}
 
@@ -1034,9 +1167,16 @@
 		{
 			get
 			{
-				return core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
-			}
-		}
+				if (kerbinGee == default(double))
+				{
+					kerbinGee = core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
+				}
+
+				return kerbinGee;
+			}
+		}
+
+		private static double kerbinGee;
 	}
 }
 

--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -29,6 +29,7 @@
 using KSP;
 using System;
 using System.Collections.Generic;
+using System.Text;
 using ToadicusTools;
 using UnityEngine;
 
@@ -139,7 +140,10 @@
 			GUILayout.EndHorizontal();
 
 			float new_log_interval;
-			if (Single.TryParse(csv_log_interval_str, out new_log_interval)) csv_log_interval = new_log_interval;
+			if (float.TryParse(csv_log_interval_str, out new_log_interval))
+			{
+				csv_log_interval = new_log_interval;
+			}
 
 			GUILayout.EndVertical();
 			GUI.DragWindow();
@@ -206,41 +210,92 @@
 			//called if logging is on and interval has passed
 			//writes one line to the csvList
 
-			string line = "";
+			StringBuilder line = new StringBuilder();
+
 			if (first_write && !KSP.IO.File.Exists<VOID_Core>(vessel.vesselName + "_data.csv", null))
 			{
 				first_write = false;
-				line += "Mission Elapsed Time (s);Altitude ASL (m);Altitude above terrain (m);Orbital Velocity (m/s);Surface Velocity (m/s);Vertical Speed (m/s);Horizontal Speed (m/s);Gee Force (gees);Temperature (°C);Gravity (m/s²);Atmosphere Density (g/m³);\n";
-			}
+				line.Append(
+					"Mission Elapsed Time (s);" +
+					"Altitude ASL (m);" +
+					"Altitude above terrain (m);" +
+					"Surface Latitude (°);" +
+					"Surface Longitude (°);" +
+					"Orbital Velocity (m/s);" +
+					"Surface Velocity (m/s);" +
+					"Vertical Speed (m/s);" +
+					"Horizontal Speed (m/s);" +
+					"Gee Force (gees);" +
+					"Temperature (°C);" +
+					"Gravity (m/s²);" +
+					"Atmosphere Density (g/m³);" +
+					"\n"
+				);
+			}
+
 			//Mission time
-			line += vessel.missionTime.ToString("F3") + ";";
+			line.Append(vessel.missionTime.ToString("F3"));
+			line.Append(';');
+
 			//Altitude ASL
-			line += vessel.orbit.altitude.ToString("F3") + ";";
+			line.Append(vessel.orbit.altitude.ToString("F3"));
+			line.Append(';');
+
 			//Altitude (true)
 			double alt_true = vessel.orbit.altitude - vessel.terrainAltitude;
 			if (vessel.terrainAltitude < 0) alt_true = vessel.orbit.altitude;
-			line += alt_true.ToString("F3") + ";";
+			line.Append(alt_true.ToString("F3"));
+			line.Append(';');
+
+			// Surface Latitude
+			line.Append(VOID_Data.surfLatitude.Value);
+			line.Append(';');
+
+			// Surface Longitude
+			line.Append(VOID_Data.surfLongitude.Value);
+			line.Append(';');
+
 			//Orbital velocity
-			line += vessel.orbit.vel.magnitude.ToString("F3") + ";";
+			line.Append(vessel.orbit.vel.magnitude.ToString("F3"));
+			line.Append(';');
+
 			//surface velocity
-			line += vessel.srf_velocity.magnitude.ToString("F3") + ";";
+			line.Append(vessel.srf_velocity.magnitude.ToString("F3"));
+			line.Append(';');
+
 			//vertical speed
-			line += vessel.verticalSpeed.ToString("F3") + ";";
+			line.Append(vessel.verticalSpeed.ToString("F3"));
+			line.Append(';');
+
 			//horizontal speed
-			line += vessel.horizontalSrfSpeed.ToString("F3") + ";";
+			line.Append(vessel.horizontalSrfSpeed.ToString("F3"));
+			line.Append(';');
+
 			//gee force
-			line += vessel.geeForce.ToString("F3") + ";";
+			line.Append(vessel.geeForce.ToString("F3"));
+			line.Append(';');
+
 			//temperature
-			line += vessel.flightIntegrator.getExternalTemperature().ToString("F2") + ";";
+			line.Append(vessel.flightIntegrator.getExternalTemperature().ToString("F2"));
+			line.Append(';');
+
 			//gravity
 			double r_vessel = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
 			double g_vessel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / (r_vessel * r_vessel);
-			line += g_vessel.ToString("F3") + ";";
+			line.Append(g_vessel.ToString("F3"));
+			line.Append(';');
+
 			//atm density
-			line += (vessel.atmDensity * 1000).ToString("F3") + ";";
-			line += "\n";
-			if (csvList.Contains(line) == false) csvList.Add(line);
+			line.Append((vessel.atmDensity * 1000).ToString("F3"));
+			line.Append(';');
+
+			line.Append('\n');
+
+			csvList.Add(line.ToString());
+
 			csvCollectTimer = 0f;
 		}
 	}
 }
+
+

--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -70,6 +70,7 @@
 			get
 			{
 				if (
+					HighLogic.LoadedSceneIsEditor ||
 					(VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) ||
 					(this.lastUpdate > VOID_Core.Instance.updateTimer)
 				)

--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -69,8 +69,17 @@
 			if (_initialized)
 			{
 				_instance.StopGUI();
+				_instance.Dispose();
 				_instance = null;
 				_initialized = false;
+			}
+		}
+
+		protected override ApplicationLauncher.AppScenes appIconVisibleScenes
+		{
+			get
+			{
+				return ApplicationLauncher.AppScenes.VAB | ApplicationLauncher.AppScenes.SPH;
 			}
 		}
 
@@ -79,7 +88,7 @@
 			this._Name = "VOID Editor Core";
 		}
 
-		public new void OnGUI() {}
+		public override void OnGUI() {}
 
 		public override void DrawGUI()
 		{
@@ -100,7 +109,7 @@
 			base.DrawGUI();
 		}
 
-		public new void Update()
+		public override void Update()
 		{
 			foreach (IVOID_EditorModule module in this.Modules)
 			{
@@ -131,18 +140,14 @@
 
 			if (EditorLogic.SortedShipList.Count > 0 && this.vesselSimActive)
 			{
-				SimManager.Gravity = VOID_Data.KerbinGee;
-				SimManager.TryStartSimulation();
-			}
-			else if (!this.vesselSimActive)
-			{
-				SimManager.ClearResults();
+				Tools.PostDebugMessage(this, "Updating SimManager.");
+				this.UpdateSimManager();
 			}
 
 			this.CheckAndSave ();
 		}
 
-		public new void FixedUpdate() {}
+		public override void FixedUpdate() {}
 	}
 }
 

--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -120,7 +120,7 @@
 		{
 			this._Name = "Heads-Up Display";
 
-			this._Active.value = true;
+			this.toggleActive = true;
 
 			this.textColors.Add(Color.green);
 			this.textColors.Add(Color.black);
@@ -143,7 +143,7 @@
 		{
 			SimManager.RequestSimulation();
 
-			if (SimManager.LastStage == null)
+			if (this.core.LastStage == null)
 			{
 				return;
 			}
@@ -164,6 +164,8 @@
 				return;
 			}
 
+			GUI.skin = this.core.Skin;
+
 			Rect hudPos = new Rect (hudLeft, 48, 300, 32);
 
 			hudString = new StringBuilder();
@@ -173,7 +175,7 @@
 			labelStyle.normal.textColor = textColors [ColorIndex];
 
 			hudString.Append("Total Mass: ");
-			hudString.Append(SimManager.LastStage.totalMass.ToString("F3"));
+			hudString.Append(this.core.LastStage.totalMass.ToString("F3"));
 			hudString.Append('t');
 
 			hudString.Append(' ');
@@ -184,19 +186,19 @@
 			hudString.Append('\n');
 
 			hudString.Append("Total Delta-V: ");
-			hudString.Append(Tools.MuMech_ToSI(SimManager.LastStage.totalDeltaV));
+			hudString.Append(Tools.MuMech_ToSI(this.core.LastStage.totalDeltaV));
 			hudString.Append("m/s");
 
 			hudString.Append('\n');
 
 			hudString.Append("Bottom Stage Delta-V");
-			hudString.Append(Tools.MuMech_ToSI(SimManager.LastStage.deltaV));
+			hudString.Append(Tools.MuMech_ToSI(this.core.LastStage.deltaV));
 			hudString.Append("m/s");
 
 			hudString.Append('\n');
 
 			hudString.Append("Bottom Stage T/W Ratio: ");
-			hudString.Append(SimManager.LastStage.thrustToWeight.ToString("F3"));
+			hudString.Append(this.core.LastStage.thrustToWeight.ToString("F3"));
 
 			if (this.CoMmarker.gameObject.activeInHierarchy && this.CoTmarker.gameObject.activeInHierarchy)
 			{

file:a/VOID_EditorTWR.cs (deleted)
--- a/VOID_EditorTWR.cs
+++ /dev/null
@@ -1,150 +1,1 @@
-// VOID © 2014 toadicus
-//
-// This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a
-// copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/
 
-using KSP;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ToadicusTools;
-using UnityEngine;
-
-namespace VOID
-{
-	public class VOID_EditorTWR : VOID_WindowModule, IVOID_EditorModule
-	{
-		private Dictionary<string, double> bodyGeeValues;
-		private List<CelestialBody> sortedBodyList;
-
-		public VOID_EditorTWR() : base()
-		{
-			this._Name = "IP Thrust-to-Weight Ratios";
-		}
-
-		public override void ModuleWindow(int _)
-		{
-			if (bodyGeeValues == null)
-			{
-				if (FlightGlobals.ready && FlightGlobals.Bodies != null && FlightGlobals.Bodies.Count > 0)
-				{
-					this.bodyGeeValues = new Dictionary<string, double>();
-
-					foreach (CelestialBody body in FlightGlobals.Bodies)
-					{
-						this.bodyGeeValues[body.name] = body.GeeASL;
-					}
-
-					this.sortedBodyList = new List<CelestialBody>(FlightGlobals.Bodies);
-					this.sortedBodyList.Sort(new CBListComparer());
-					this.sortedBodyList.Reverse();
-
-					Debug.Log(string.Format("sortedBodyList: {0}", string.Join("\n\t", this.sortedBodyList.Select(b => b.bodyName).ToArray())));
-				}
-				else
-				{
-					return;
-				}
-			}
-
-			GUILayout.BeginVertical();
-
-			foreach (CelestialBody body in this.sortedBodyList)
-			{
-				Tools.PostDebugMessage(this, "Doing label for {0}", body.bodyName);
-				GUILayout.BeginHorizontal();
-
-				GUILayout.Label(body.bodyName);
-				GUILayout.FlexibleSpace();
-				GUILayout.Label(
-					(VOID_Data.currThrustWeight.Value / this.bodyGeeValues[body.bodyName]).ToString("#.0##"),
-					GUILayout.ExpandWidth(true)
-				);
-
-				GUILayout.EndHorizontal();
-			}
-
-			GUILayout.EndVertical();
-		}
-	}
-
-	public class CBListComparer : IComparer<CelestialBody>
-	{
-		public int Compare(CelestialBody bodyA, CelestialBody bodyB)
-		{
-			Tools.PostDebugMessage(this, "got bodyA: {0} & bodyB: {1}", bodyA, bodyB);
-
-			if (bodyA == null && bodyB == null)
-			{
-				Tools.PostDebugMessage(this, "both bodies are null, returning 0");
-				return 0;
-			}
-			if (bodyA == null)
-			{
-				Tools.PostDebugMessage(this, "bodyA is null, returning -1");
-				return -1;
-			}
-			if (bodyB == null)
-			{
-				Tools.PostDebugMessage(this, "bodyB is null, returning 1");
-				return 1;
-			}
-
-			Tools.PostDebugMessage(this, "bodies are not null, carrying on");
-
-			if (object.ReferenceEquals(bodyA, bodyB))
-			{
-				Tools.PostDebugMessage(this, "bodies are equal, returning 0");
-				return 0;
-			}
-
-			Tools.PostDebugMessage(this, "bodies are not equal, carrying on");
-
-			if (bodyA.orbitDriver == null)
-			{
-				Tools.PostDebugMessage(this, "bodyA.orbit is null (bodyA is the sun, returning 1");
-				return 1;
-			}
-			if (bodyB.orbitDriver == null)
-			{
-				Tools.PostDebugMessage(this, "bodyB.orbit is null (bodyB is the sun, returning -1");
-				return -1;
-			}
-
-			Tools.PostDebugMessage(this, "orbits are not null, carrying on");
-
-			if (bodyA.orbit.referenceBody == bodyB.orbit.referenceBody)
-			{
-				Tools.PostDebugMessage(this, "bodies share a parent, comparing SMAs");
-				return -bodyA.orbit.semiMajorAxis.CompareTo(bodyB.orbit.semiMajorAxis);
-			}
-
-			Tools.PostDebugMessage(this, "orbits do not share a parent, carrying on");
-
-			if (bodyA.hasAncestor(bodyB))
-			{
-				Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning -1");
-				return -1;
-			}
-			if (bodyB.hasAncestor(bodyA))
-			{
-				Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning 1");
-				return 1;
-			}
-
-			Tools.PostDebugMessage(this, "bodies do not have an obvious relationship, searching for one");
-
-			if (VOID_Tools.NearestRelatedParents(ref bodyA, ref bodyB))
-			{
-				Tools.PostDebugMessage(this, "good relation {0} and {1}, comparing", bodyA.bodyName, bodyB.bodyName);
-				return this.Compare(bodyA, bodyB);
-			}
-
-			Tools.PostDebugMessage(this, "bad relation {0} and {1}, giving up", bodyA.bodyName, bodyB.bodyName);
-
-			return 0;
-		}
-	}
-}
-
-

--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -85,7 +85,7 @@
 		{
 			this._Name = "Heads-Up Display";
 
-			this._Active.value = true;
+			this.toggleActive = true;
 
 			this._colorIndex = 0;
 
@@ -118,9 +118,9 @@
 
 			leftHUD = new StringBuilder();
 
-			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperRight;
-
-			if (VOID_Core.Instance.powerAvailable)
+			this.core.LabelStyles["hud"].alignment = TextAnchor.UpperRight;
+
+			if (this.core.powerAvailable)
 			{
 				leftHUD.AppendFormat("Primary: {0} Inc: {1}",
 					VOID_Data.primaryName.ValueUnitString(),
@@ -145,11 +145,11 @@
 			}
 			else
 			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				this.core.LabelStyles["hud"].normal.textColor = Color.red;
 				leftHUD.Append(string.Intern("-- POWER LOST --"));
 			}
 
-			GUILayout.Label(leftHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(leftHUD.ToString(), this.core.LabelStyles["hud"], GUILayout.ExpandWidth(true));
 
 			if (!this.positionsLocked)
 			{
@@ -165,9 +165,9 @@
 
 			rightHUD = new StringBuilder();
 
-			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperLeft;
-
-			if (VOID_Core.Instance.powerAvailable)
+			this.core.LabelStyles["hud"].alignment = TextAnchor.UpperLeft;
+
+			if (this.core.powerAvailable)
 			{
 				rightHUD.AppendFormat("Biome: {0} Sit: {1}",
 					VOID_Data.currBiome.ValueUnitString(),
@@ -189,15 +189,28 @@
 					VOID_Data.vesselHeading.ValueUnitString(),
 					VOID_Data.vesselPitch.ToSIString(2)
 				);
+
+				if (
+					this.core.vessel.mainBody == this.core.Kerbin &&
+					(
+						this.core.vessel.situation == Vessel.Situations.FLYING ||
+						this.core.vessel.situation == Vessel.Situations.SUB_ORBITAL ||
+						this.core.vessel.situation == Vessel.Situations.LANDED ||
+						this.core.vessel.situation == Vessel.Situations.SPLASHED
+					)
+				)
+				{
+					rightHUD.AppendFormat("\nRange to KSC: {0}", VOID_Data.downrangeDistance.ValueUnitString(2));
+				}
 			}
 			else
 			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				this.core.LabelStyles["hud"].normal.textColor = Color.red;
 				rightHUD.Append(string.Intern("-- POWER LOST --"));
 			}
 
 
-			GUILayout.Label(rightHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(rightHUD.ToString(), this.core.LabelStyles["hud"], GUILayout.ExpandWidth(true));
 
 			if (!this.positionsLocked)
 			{
@@ -209,12 +222,14 @@
 
 		public override void DrawGUI()
 		{
-			if (!VOID_Core.Instance.LabelStyles.ContainsKey("hud"))
-			{
-				VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle(GUI.skin.label);
-			}
-
-			VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
+			if (!this.core.LabelStyles.ContainsKey("hud"))
+			{
+				this.core.LabelStyles["hud"] = new GUIStyle(GUI.skin.label);
+			}
+
+			this.core.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
+
+			GUI.skin = this.core.Skin;
 
 			if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
 			{
@@ -222,7 +237,7 @@
 			}
 
 			this.leftHUDPos.value = GUI.Window(
-				VOID_Core.Instance.windowID,
+				this.core.windowID,
 				this.leftHUDPos,
 				this.leftHUDWindow,
 				GUIContent.none,
@@ -230,7 +245,7 @@
 			);
 
 			this.rightHUDPos.value = GUI.Window(
-				VOID_Core.Instance.windowID,
+				this.core.windowID,
 				this.rightHUDPos,
 				this.rightHUDWindow,
 				GUIContent.none,
@@ -261,7 +276,7 @@
 	{
 		public static readonly VOID_StrValue expSituation = new VOID_StrValue(
 			"Situation",
-			new Func<string> (() => VOID_Core.Instance.vessel.GetExperimentSituation().HumanString())
+			new Func<string> (() => core.vessel.GetExperimentSituation().HumanString())
 		);
 
 		public static readonly VOID_DoubleValue vesselPitch = new VOID_DoubleValue(
@@ -269,6 +284,44 @@
 			() => core.vessel.getSurfacePitch(),
 			"°"
 		);
+
+		public static readonly VOID_DoubleValue downrangeDistance = new VOID_DoubleValue(
+			"Downrange Distance",
+			delegate() {
+
+			if (core.vessel == null ||
+				Planetarium.fetch == null ||
+				core.vessel.mainBody != Planetarium.fetch.Home
+			)
+			{
+				return double.NaN;
+			}
+
+			double vesselLongitude = core.vessel.longitude * Math.PI / 180d;
+			double vesselLatitude = core.vessel.latitude * Math.PI / 180d;
+
+			const double kscLongitude = 285.442323427289 * Math.PI / 180d;
+			const double kscLatitude = -0.0972112860655246 * Math.PI / 180d;
+
+			double diffLon = vesselLongitude - kscLongitude;
+			double diffLat = vesselLatitude - kscLatitude;
+
+			double sinHalfDiffLat = Math.Sin(diffLat / 2d);
+			double sinHalfDiffLon = Math.Sin(diffLon / 2d);
+
+			double cosVesselLon = Math.Cos(vesselLongitude);
+			double cosKSCLon = Math.Cos(kscLongitude);
+
+			double haversine =
+				sinHalfDiffLat * sinHalfDiffLat +
+				cosVesselLon * cosKSCLon * sinHalfDiffLon * sinHalfDiffLon;
+
+			double arc = 2d * Math.Atan2(Math.Sqrt(haversine), Math.Sqrt(1d - haversine));
+
+			return core.vessel.mainBody.Radius * arc;
+		},
+			"m"
+		);
 	}
 }
 

--- a/VOID_HUDAdvanced.cs
+++ b/VOID_HUDAdvanced.cs
@@ -78,7 +78,7 @@
 		{
 			this._Name = "Advanced Heads-Up Display";
 
-			this._Active.value = true;
+			this.toggleActive = true;
 
 			this.leftHUDdefaultPos = new Rect(
 				Screen.width * .5f - (float)GameSettings.UI_SIZE * .25f - 300f,
@@ -105,9 +105,9 @@
 
 			leftHUD = new StringBuilder();
 
-			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperRight;
-
-			if (VOID_Core.Instance.powerAvailable)
+			this.core.LabelStyles["hud"].alignment = TextAnchor.UpperRight;
+
+			if (this.core.powerAvailable)
 			{
 				leftHUD.AppendFormat(
 					string.Intern("Mass: {0}\n"),
@@ -144,11 +144,11 @@
 			}
 			else
 			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				this.core.LabelStyles["hud"].normal.textColor = Color.red;
 				leftHUD.Append(string.Intern("-- POWER LOST --"));
 			}
 
-			GUILayout.Label(leftHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(leftHUD.ToString(), this.core.LabelStyles["hud"], GUILayout.ExpandWidth(true));
 
 			if (!this.positionsLocked)
 			{
@@ -164,9 +164,9 @@
 
 			rightHUD = new StringBuilder();
 
-			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperLeft;
-
-			if (VOID_Core.Instance.powerAvailable)
+			this.core.LabelStyles["hud"].alignment = TextAnchor.UpperLeft;
+
+			if (this.core.powerAvailable)
 			{
 				rightHUD.AppendFormat(
 					"Burn Δv (Rem/Tot): {0} / {1}\n",
@@ -203,11 +203,11 @@
 			}
 			else
 			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				this.core.LabelStyles["hud"].normal.textColor = Color.red;
 				rightHUD.Append(string.Intern("-- POWER LOST --"));
 			}
 
-			GUILayout.Label(rightHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(rightHUD.ToString(), this.core.LabelStyles["hud"], GUILayout.ExpandWidth(true));
 
 			if (!this.positionsLocked)
 			{
@@ -221,7 +221,7 @@
 		{
 			if (this.primaryHUD == null)
 			{
-				foreach (IVOID_Module module in VOID_Core.Instance.Modules)
+				foreach (IVOID_Module module in this.core.Modules)
 				{
 					if (module is VOID_HUD)
 					{
@@ -237,7 +237,7 @@
 				}
 
 				this.leftHUDPos.value = GUI.Window(
-					VOID_Core.Instance.windowID,
+					this.core.windowID,
 					this.leftHUDPos,
 					VOID_Tools.GetWindowHandler(this.leftHUDWindow),
 					GUIContent.none,
@@ -247,9 +247,9 @@
 				if (VOID_Data.upcomingManeuverNodes > 0)
 				{
 					this.rightHUDPos.value = GUI.Window(
-						VOID_Core.Instance.windowID,
+						this.core.windowID,
 						this.rightHUDPos,
-						VOID_Tools.GetWindowHandler(this.leftHUDWindow),
+						VOID_Tools.GetWindowHandler(this.rightHUDWindow),
 						GUIContent.none,
 						GUIStyle.none
 					);
@@ -378,7 +378,7 @@
 		public static readonly VOID_DoubleValue vesselAccel = new VOID_DoubleValue(
 			"Acceleration",
 			() => geeForce * KerbinGee,
-			"m/s"
+			"m/s²"
 		);
 
 		public static readonly VOID_IntValue vesselCrewCount = new VOID_IntValue(
@@ -433,18 +433,18 @@
 			"Nominal Stage Thrust",
 			delegate()
 		{
-			if (SimManager.LastStage == null)
+			if (core.LastStage == null)
 			{
 				return double.NaN;
 			}
 
-			if (SimManager.LastStage.actualThrust == 0d)
-			{
-				return SimManager.LastStage.thrust;
-			}
-			else
-			{
-				return SimManager.LastStage.actualThrust;
+			if (core.LastStage.actualThrust == 0d)
+			{
+				return core.LastStage.thrust;
+			}
+			else
+			{
+				return core.LastStage.actualThrust;
 			}
 		},
 			"kN"
@@ -454,12 +454,12 @@
 			"Stage Mass Flow",
 			delegate()
 			{
-				if (SimManager.LastStage == null)
+				if (core.LastStage == null)
 				{
 					return double.NaN;
 				}
 
-			double stageIsp = SimManager.LastStage.isp;
+			double stageIsp = core.LastStage.isp;
 			double stageThrust = stageNominalThrust;
 
 			Tools.PostDebugMessage(typeof(VOID_Data), "calculating stageMassFlow from:\n" +
@@ -528,7 +528,7 @@
 			"Total Burn Time",
 			delegate()
 			{
-				if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+				if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
 				{
 					return double.NaN;
 				}
@@ -544,7 +544,7 @@
 			"Burn Time Remaining",
 			delegate()
 			{
-				if (SimManager.LastStage == null || currManeuverDVRemaining == double.NaN)
+				if (core.LastStage == null || currManeuverDVRemaining == double.NaN)
 				{
 					return double.NaN;
 				}
@@ -560,7 +560,7 @@
 			"Half Burn Time",
 			delegate()
 		{
-			if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+			if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
 			{
 				return double.NaN;
 			}
@@ -576,7 +576,7 @@
 			"Full burn time to be half done at node",
 			delegate()
 		{
-			if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+			if (core.LastStage == null && upcomingManeuverNodes < 1)
 			{
 				return "N/A";
 			}
@@ -589,6 +589,11 @@
 			}
 
 			double interval = (node.UT - currentNodeBurnDuration) - Planetarium.GetUniversalTime();
+
+			if (double.IsNaN(interval))
+			{
+				return string.Intern("NaN");
+			}
 
 			int sign = Math.Sign(interval);
 			interval = Math.Abs(interval);
@@ -612,7 +617,7 @@
 			"Full burn time to be half done at node",
 			delegate()
 			{
-			if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+			if (core.LastStage == null && upcomingManeuverNodes < 1)
 			{
 				return "N/A";
 			}
@@ -625,6 +630,11 @@
 			}
 
 			double interval = (node.UT - currentNodeHalfBurnDuration) - Planetarium.GetUniversalTime();
+
+			if (double.IsNaN(interval))
+			{
+				return string.Intern("NaN");
+			}
 
 			int sign = Math.Sign(interval);
 			interval = Math.Abs(interval);

--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -55,6 +55,11 @@
 		{
 			get
 			{
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					return VOID_EditorCore.Instance as VOID_Core;
+				}
+
 				return VOID_Core.Instance;
 			}
 		}
@@ -210,22 +215,30 @@
 	public abstract class VOID_WindowModule : VOID_Module
 	{
 		[AVOID_SaveValue("WindowPos")]
-		protected Rect WindowPos = new Rect(Screen.width / 2, Screen.height / 2, 250f, 50f);
-		protected float defWidth = 250f;
-		protected float defHeight = 50f;
+		protected Rect WindowPos;
+		protected float defWidth;
+		protected float defHeight;
+
+		public VOID_WindowModule() : base()
+		{
+			this.defWidth = 250f;
+			this.defHeight = 50f;
+
+			this.WindowPos = new Rect(Screen.width / 2, Screen.height / 2, this.defWidth, this.defHeight);
+		}
 
 		public abstract void ModuleWindow(int _);
 
 		public override void DrawGUI()
 		{
-			GUI.skin = VOID_Core.Instance.Skin;
+			GUI.skin = this.core.Skin;
 
 			Rect _Pos = this.WindowPos;
 
 			_Pos = GUILayout.Window(
-				VOID_Core.Instance.windowID,
+				this.core.windowID,
 				_Pos,
-				this.ModuleWindow,
+				VOID_Tools.GetWindowHandler(this.ModuleWindow),
 				this.Name,
 				GUILayout.Width(this.defWidth),
 				GUILayout.Height(this.defHeight)
@@ -236,7 +249,7 @@
 			if (_Pos != this.WindowPos)
 			{
 				this.WindowPos = _Pos;
-				VOID_Core.Instance.configDirty = true;
+				this.core.configDirty = true;
 			}
 		}
 	}

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -129,51 +129,51 @@
 			VOID_Localization.void_primary,
 			delegate()
 		{
-			if (VOID_Core.Instance.vessel == null)
+			if (core.vessel == null)
 			{
 				return string.Empty;
 			}
-			return VOID_Core.Instance.vessel.mainBody.name;
+			return core.vessel.mainBody.name;
 		}
 		);
 
 		public static readonly VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
 			"Altitude (ASL)",
-			new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
+			new Func<double> (() => core.vessel.orbit.altitude),
 			"m"
 		);
 
 		public static readonly VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
 			VOID_Localization.void_velocity,
-			new Func<double> (() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
+			new Func<double> (() => core.vessel.orbit.vel.magnitude),
 			"m/s"
 		);
 
 		public static readonly VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
 			VOID_Localization.void_apoapsis,
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
+			new Func<double>(() => core.vessel.orbit.ApA),
 			"m"
 		);
 
 		public static readonly VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
 			VOID_Localization.void_periapsis,
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
+			new Func<double>(() => core.vessel.orbit.PeA),
 			"m"
 		);
 
 		public static readonly VOID_StrValue timeToApo = new VOID_StrValue(
 			"Time to Apoapsis",
-			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+			new Func<string>(() => VOID_Tools.ConvertInterval(core.vessel.orbit.timeToAp))
 		);
 
 		public static readonly VOID_StrValue timeToPeri = new VOID_StrValue(
 			"Time to Periapsis",
-			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
+			new Func<string>(() => VOID_Tools.ConvertInterval(core.vessel.orbit.timeToPe))
 		);
 
 		public static readonly VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
 			"Inclination",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
+			new Func<double>(() => core.vessel.orbit.inclination),
 			"°"
 		);
 
@@ -181,9 +181,9 @@
 			"Gravity",
 			delegate()
 		{
-			double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
-				VOID_Core.Instance.vessel.mainBody.GetAltitude(VOID_Core.Instance.vessel.findWorldCenterOfMass());
-			return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
+			double orbitRadius = core.vessel.mainBody.Radius +
+				core.vessel.mainBody.GetAltitude(core.vessel.findWorldCenterOfMass());
+			return (VOID_Core.Constant_G * core.vessel.mainBody.Mass) /
 				(orbitRadius * orbitRadius);
 		},
 			"m/s²"
@@ -191,55 +191,55 @@
 
 		public static readonly VOID_StrValue orbitPeriod = new VOID_StrValue(
 			"Period",
-			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+			new Func<string>(() => VOID_Tools.ConvertInterval(core.vessel.orbit.period))
 		);
 
 		public static readonly VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
 			"Semi-Major Axis",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
+			new Func<double>(() => core.vessel.orbit.semiMajorAxis),
 			"m"
 		);
 
 		public static readonly VOID_DoubleValue eccentricity = new VOID_DoubleValue(
 			"Eccentricity",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
+			new Func<double>(() => core.vessel.orbit.eccentricity),
 			""
 		);
 
 		public static readonly VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
 			"Mean Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
+			new Func<double>(() => core.vessel.orbit.meanAnomaly * 180d / Math.PI),
 			"°"
 		);
 
 		public static readonly VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
 			"True Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
+			new Func<double>(() => core.vessel.orbit.trueAnomaly),
 			"°"
 		);
 
 		public static readonly VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
 			"Eccentric Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
+			new Func<double>(() => core.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
 			"°"
 		);
 
 		public static readonly VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
 			"Long. Ascending Node",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
+			new Func<double>(() => core.vessel.orbit.LAN),
 			"°"
 		);
 
 		public static readonly VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
 			"Argument of Periapsis",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
+			new Func<double>(() => core.vessel.orbit.argumentOfPeriapsis),
 			"°"
 		);
 
 		public static readonly VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
 			"Local Sidereal Longitude",
 			new Func<double>(() => VOID_Tools.FixDegreeDomain(
-				VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
+				core.vessel.longitude + core.vessel.orbit.referenceBody.rotationAngle)),
 			"°"
 		);
 	}

--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -60,14 +60,14 @@
 
 			if (this.RegisterModule == null)
 			{
-				this.RegisterModule = VOID_Core.Instance.Modules.Where(m => typeof(VOID_VesselRegister).IsAssignableFrom(m.GetType())).FirstOrDefault() as VOID_VesselRegister;
+				this.RegisterModule = this.core.Modules.Where(m => typeof(VOID_VesselRegister).IsAssignableFrom(m.GetType())).FirstOrDefault() as VOID_VesselRegister;
 			}
 
 			GUILayout.BeginVertical();
 
 			//display both
 			//Show Target Info
-			GUILayout.Label("Target:", VOID_Core.Instance.LabelStyles["center_bold"]);
+			GUILayout.Label("Target:", this.core.LabelStyles["center_bold"]);
 			if (FlightGlobals.fetch.VesselTarget != null)
 			{
 				//a KSP Target (body or vessel) is selected
@@ -94,13 +94,13 @@
 			else
 			{
 				//no KSP Target selected
-				GUILayout.Label("No Target Selected", VOID_Core.Instance.LabelStyles["center_bold"]);
+				GUILayout.Label("No Target Selected", this.core.LabelStyles["center_bold"]);
 			}
 
 			//Show Vessel Register vessel info
 			if (untoggleRegisterInfo == false && this.RegisterModule != default(IVOID_Module))
 			{
-				GUILayout.Label("Vessel Register:", VOID_Core.Instance.LabelStyles["center_bold"]);
+				GUILayout.Label("Vessel Register:", this.core.LabelStyles["center_bold"]);
 				if (this.RegisterModule.selectedVessel != null)
 				{
 					rendezvessel = this.RegisterModule.selectedVessel;
@@ -122,7 +122,7 @@
 				{
 					//vesreg Vessel is null
 					//targ = null;
-					GUILayout.Label("No Vessel Selected", VOID_Core.Instance.LabelStyles["center_bold"]);
+					GUILayout.Label("No Vessel Selected", this.core.LabelStyles["center_bold"]);
 				}
 			}
 
@@ -130,7 +130,7 @@
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(" ", GUILayout.ExpandWidth(true));
-			if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this._Active = false;
+			if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this.toggleActive = false;
 			GUILayout.EndHorizontal();
 
 			GUILayout.EndVertical();
@@ -143,7 +143,7 @@
 			{
 				//Display vessel rendezvous info
 				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label(v.vesselName, VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
+				GUILayout.Label(v.vesselName, this.core.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
 				GUILayout.EndHorizontal();
 
 				if (v.situation == Vessel.Situations.ESCAPING || v.situation == Vessel.Situations.FLYING || v.situation == Vessel.Situations.ORBITING || v.situation == Vessel.Situations.SUB_ORBITAL)
@@ -196,7 +196,7 @@
 					// Toadicus edit: added local sidereal longitude.
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 					GUILayout.Label("Local Sidereal Longitude:");
-					GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"]);
+					GUILayout.Label(LSL.ToString("F3") + "°", this.core.LabelStyles["right"]);
 					GUILayout.EndHorizontal();
 
 					toggleExtendedOrbital.value = GUILayout.Toggle(toggleExtendedOrbital, "Extended info");
@@ -267,7 +267,7 @@
 			else if (cb != null && v == null)
 			{
 				//Display CelstialBody rendezvous info
-				GUILayout.Label(cb.bodyName, VOID_Core.Instance.LabelStyles["center_bold"]);
+				GUILayout.Label(cb.bodyName, this.core.LabelStyles["center_bold"]);
 
 				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 				GUILayout.Label("Ap/Pe:");

--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -111,11 +111,11 @@
 			"Altitude (true)",
 			delegate()
 			{
-				double alt_true = VOID_Core.Instance.vessel.orbit.altitude - VOID_Core.Instance.vessel.terrainAltitude;
+				double alt_true = core.vessel.orbit.altitude - core.vessel.terrainAltitude;
 				// HACK: This assumes that on worlds with oceans, all water is fixed at 0 m,
 				// and water covers the whole surface at 0 m.
-				if (VOID_Core.Instance.vessel.terrainAltitude < 0 && VOID_Core.Instance.vessel.mainBody.ocean )
-					alt_true = VOID_Core.Instance.vessel.orbit.altitude;
+				if (core.vessel.terrainAltitude < 0 && core.vessel.mainBody.ocean )
+					alt_true = core.vessel.orbit.altitude;
 				return alt_true;
 			},
 			"m"
@@ -123,12 +123,12 @@
 
 		public static readonly VOID_StrValue surfLatitude = new VOID_StrValue(
 			"Latitude",
-			new Func<string> (() => VOID_Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+			new Func<string> (() => VOID_Tools.GetLatitudeString(core.vessel))
 		);
 
 		public static readonly VOID_StrValue surfLongitude = new VOID_StrValue(
 			"Longitude",
-			new Func<string> (() => VOID_Tools.GetLongitudeString(VOID_Core.Instance.vessel))
+			new Func<string> (() => VOID_Tools.GetLongitudeString(core.vessel))
 		);
 
 		public static readonly VOID_StrValue vesselHeading = new VOID_StrValue(
@@ -148,55 +148,55 @@
 
 		public static readonly VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
 			"Terrain elevation",
-			new Func<double> (() => VOID_Core.Instance.vessel.terrainAltitude),
+			new Func<double> (() => core.vessel.terrainAltitude),
 			"m"
 		);
 
 		public static readonly VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
 			"Surface velocity",
-			new Func<double> (() => VOID_Core.Instance.vessel.srf_velocity.magnitude),
+			new Func<double> (() => core.vessel.srf_velocity.magnitude),
 			"m/s"
 		);
 
 		public static readonly VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
 			"Vertical speed",
-			new Func<double> (() => VOID_Core.Instance.vessel.verticalSpeed),
+			new Func<double> (() => core.vessel.verticalSpeed),
 			"m/s"
 		);
 
 		public static readonly VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
 			"Horizontal speed",
-			new Func<double> (() => VOID_Core.Instance.vessel.horizontalSrfSpeed),
+			new Func<double> (() => core.vessel.horizontalSrfSpeed),
 			"m/s"
 		);
 
 		public static readonly VOID_FloatValue temperature = new VOID_FloatValue(
 			"Temperature",
-			new Func<float> (() => VOID_Core.Instance.vessel.flightIntegrator.getExternalTemperature()),
+			new Func<float> (() => core.vessel.flightIntegrator.getExternalTemperature()),
 			"°C"
 		);
 
 		public static readonly VOID_DoubleValue atmDensity = new VOID_DoubleValue (
 			"Atmosphere Density",
-			new Func<double> (() => VOID_Core.Instance.vessel.atmDensity * 1000f),
+			new Func<double> (() => core.vessel.atmDensity * 1000f),
 			"g/m³"
 		);
 
 		public static readonly VOID_DoubleValue atmPressure = new VOID_DoubleValue (
 			"Pressure",
-			new Func<double> (() => VOID_Core.Instance.vessel.staticPressure),
+			new Func<double> (() => core.vessel.staticPressure),
 			"atm"
 		);
 
 		public static readonly VOID_FloatValue atmLimit = new VOID_FloatValue(
 			"Atmosphere Limit",
-			new Func<float> (() => VOID_Core.Instance.vessel.mainBody.maxAtmosphereAltitude),
+			new Func<float> (() => core.vessel.mainBody.maxAtmosphereAltitude),
 			"m"
 		);
 
 		public static readonly VOID_StrValue currBiome = new VOID_StrValue(
 			"Biome",
-			new Func<string> (() => VOID_Tools.GetBiome(VOID_Core.Instance.vessel).name)
+			new Func<string> (() => VOID_Tools.GetBiome(core.vessel).name)
 		);
 
 	}

file:b/VOID_TWR.cs (new)
--- /dev/null
+++ b/VOID_TWR.cs
@@ -1,1 +1,97 @@
+// VOID © 2014 toadicus
+//
+// This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a
+// copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/
 
+using KSP;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public class VOID_TWR : VOID_WindowModule
+	{
+		private List<CelestialBody> sortedBodyList;
+
+		public VOID_TWR() : base()
+		{
+			this._Name = "IP Thrust-to-Weight Ratios";
+		}
+
+		public override void ModuleWindow(int _)
+		{
+			if (
+				HighLogic.LoadedSceneIsEditor ||
+				(TimeWarp.WarpMode == TimeWarp.Modes.LOW) ||
+				(TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate)
+			)
+			{
+				Engineer.VesselSimulator.SimManager.RequestSimulation();
+			}
+
+			GUILayout.BeginVertical();
+
+			if (this.sortedBodyList == null)
+			{
+				if (FlightGlobals.Bodies != null && FlightGlobals.Bodies.Count > 0)
+				{
+					this.sortedBodyList = new List<CelestialBody>(FlightGlobals.Bodies);
+					this.sortedBodyList.Sort(new CBListComparer());
+					this.sortedBodyList.Reverse();
+
+					Debug.Log(string.Format("sortedBodyList: {0}", string.Join("\n\t", this.sortedBodyList.Select(b => b.bodyName).ToArray())));
+				}
+				else
+				{
+					GUILayout.BeginHorizontal();
+					GUILayout.Label("Unavailable.");
+					GUILayout.EndHorizontal();
+				}
+			}
+			else
+			{
+				foreach (CelestialBody body in this.sortedBodyList)
+				{
+					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+					GUILayout.Label(body.bodyName);
+					GUILayout.FlexibleSpace();
+					GUILayout.Label(
+						(VOID_Data.nominalThrustWeight.Value / body.GeeASL).ToString("0.0##"),
+						GUILayout.ExpandWidth(true)
+					);
+
+					GUILayout.EndHorizontal();
+				}
+			}
+
+			GUILayout.EndVertical();
+
+			GUI.DragWindow();
+		}
+	}
+
+	public class VOID_EditorTWR : VOID_TWR, IVOID_EditorModule {}
+
+	public static partial class VOID_Data
+	{
+		public static readonly VOID_DoubleValue nominalThrustWeight = new VOID_DoubleValue(
+			"Thrust-to-Weight Ratio",
+			delegate()
+		{
+			if (HighLogic.LoadedSceneIsEditor || currThrustWeight.Value == 0d)
+			{
+				return maxThrustWeight.Value;
+			}
+
+			return currThrustWeight.Value;
+		},
+			""
+		);
+	}
+}
+
+

--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -29,6 +29,7 @@
 using KSP;
 using System;
 using System.Collections.Generic;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -333,14 +334,30 @@
 					{
 						func(id);
 					}
+					#if DEBUG
 					catch (ArgumentException ex)
+					#else
+					catch (ArgumentException)
+					#endif
 					{
 						Debug.LogWarning(
-							string.Format("[{0}]: ArgumentException caught during window call.", func.Target.GetType().Name)
-						);
-						#if DEBUG
+							string.Format("[{0}]: ArgumentException caught during window call.  This is not a bug.",
+								func.Target.GetType().Name
+							));
+
+						/*#if DEBUG
 						Debug.LogException(ex);
-						#endif
+						#endif*/
+					}
+					catch (Exception ex)
+					{
+						Debug.LogError(
+							string.Format("[{0}]: {1} caught during window call.\nMessage:\n{2}\nStackTrace:\n{3}",
+								func.Target.GetType().Name,
+								ex.GetType().Name,
+								ex.Message,
+								ex.StackTrace
+							));
 					}
 				};
 			}
@@ -863,6 +880,83 @@
 				return "";
 		}
 	}
+
+	public class CBListComparer : IComparer<CelestialBody>
+	{
+		public int Compare(CelestialBody bodyA, CelestialBody bodyB)
+		{
+			Tools.PostDebugMessage(this, "got bodyA: {0} & bodyB: {1}", bodyA, bodyB);
+
+			if (bodyA == null && bodyB == null)
+			{
+				Tools.PostDebugMessage(this, "both bodies are null, returning 0");
+				return 0;
+			}
+			if (bodyA == null)
+			{
+				Tools.PostDebugMessage(this, "bodyA is null, returning -1");
+				return -1;
+			}
+			if (bodyB == null)
+			{
+				Tools.PostDebugMessage(this, "bodyB is null, returning 1");
+				return 1;
+			}
+
+			Tools.PostDebugMessage(this, "bodies are not null, carrying on");
+
+			if (object.ReferenceEquals(bodyA, bodyB))
+			{
+				Tools.PostDebugMessage(this, "bodies are equal, returning 0");
+				return 0;
+			}
+
+			Tools.PostDebugMessage(this, "bodies are not equal, carrying on");
+
+			if (bodyA.orbitDriver == null)
+			{
+				Tools.PostDebugMessage(this, "bodyA.orbit is null (bodyA is the sun, returning 1");
+				return 1;
+			}
+			if (bodyB.orbitDriver == null)
+			{
+				Tools.PostDebugMessage(this, "bodyB.orbit is null (bodyB is the sun, returning -1");
+				return -1;
+			}
+
+			Tools.PostDebugMessage(this, "orbits are not null, carrying on");
+
+			if (bodyA.orbit.referenceBody == bodyB.orbit.referenceBody)
+			{
+				Tools.PostDebugMessage(this, "bodies share a parent, comparing SMAs");
+				return -bodyA.orbit.semiMajorAxis.CompareTo(bodyB.orbit.semiMajorAxis);
+			}
+
+			Tools.PostDebugMessage(this, "orbits do not share a parent, carrying on");
+
+			if (bodyA.hasAncestor(bodyB))
+			{
+				Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning -1");
+				return -1;
+			}
+			if (bodyB.hasAncestor(bodyA))
+			{
+				Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning 1");
+				return 1;
+			}
+
+			Tools.PostDebugMessage(this, "bodies do not have an obvious relationship, searching for one");
+
+			if (VOID_Tools.NearestRelatedParents(ref bodyA, ref bodyB))
+			{
+				Tools.PostDebugMessage(this, "good relation {0} and {1}, comparing", bodyA.bodyName, bodyB.bodyName);
+				return this.Compare(bodyA, bodyB);
+			}
+
+			Tools.PostDebugMessage(this, "bad relation {0} and {1}, giving up", bodyA.bodyName, bodyB.bodyName);
+
+			return 0;
+		}
+	}
 }
 
-

--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -39,7 +39,7 @@
 	{
 		protected List<CelestialBody> selectedBodies = new List<CelestialBody>();
 
-		public VOID_Transfer()
+		public VOID_Transfer() : base()
 		{
 			this._Name = "Transfer Angle Information";
 

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -57,7 +57,7 @@
 
 			GUILayout.Label(
 				vessel.vesselName,
-				VOID_Core.Instance.LabelStyles["center_bold"],
+				core.LabelStyles["center_bold"],
 				GUILayout.ExpandWidth(true));
 
 			VOID_Data.geeForce.DoGUIHorizontal ("F2");
@@ -66,7 +66,9 @@
 
 			VOID_Data.totalMass.DoGUIHorizontal ("F3");
 
-			VOID_Data.resourceMass.DoGUIHorizontal ("F3");
+			VOID_Data.stageResourceMass.DoGUIHorizontal("F2");
+
+			VOID_Data.resourceMass.DoGUIHorizontal("F2");
 
 			VOID_Data.stageDeltaV.DoGUIHorizontal (3, false);
 
@@ -92,13 +94,13 @@
 	{
 		public static readonly VOID_DoubleValue geeForce = new VOID_DoubleValue(
 			"G-force",
-			new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
+			new Func<double>(() => core.vessel.geeForce),
 			"gees"
 		);
 
 		public static readonly VOID_IntValue partCount = new VOID_IntValue(
 			"Parts",
-			new Func<int>(() => VOID_Core.Instance.vessel.Parts.Count),
+			new Func<int>(() => core.vessel.Parts.Count),
 			""
 		);
 
@@ -106,12 +108,12 @@
 			"Total Mass",
 			delegate()
 		{
-			if (SimManager.Stages == null || SimManager.LastStage == null)
+			if (core.Stages == null || core.LastStage == null)
 			{
 				return double.NaN;
 			}
 
-			return SimManager.LastStage.totalMass;
+			return core.LastStage.totalMass;
 		},
 			"tons"
 		);
@@ -120,23 +122,48 @@
 			"Resource Mass",
 			delegate()
 			{
-				if (SimManager.Stages == null || SimManager.LastStage == null)
+				if (core.Stages == null || core.LastStage == null)
 				{
 					return double.NaN;
 				}
 
-				return SimManager.LastStage.totalMass - SimManager.LastStage.totalBaseMass;
+				return core.LastStage.totalMass - core.LastStage.totalBaseMass;
 			},
 			"tons"
+		);
+
+		public static readonly VOID_DoubleValue stageResourceMass = new VOID_DoubleValue(
+			"Resource Mass (Stage)",
+			delegate()
+			{
+				if (core.LastStage == null)
+				{
+					return double.NaN;
+				}
+
+				return core.LastStage.mass - core.LastStage.baseMass;
+			},
+			"tons"
+		);
+
+		public static readonly VOID_StrValue comboResourceMass = new VOID_StrValue(
+			"Resource Mass (curr / total)",
+			delegate()
+		{
+			return string.Format("{0} / {1}",
+				stageResourceMass.ValueUnitString("F3"),
+				resourceMass.ValueUnitString("F3")
+			);
+		}
 		);
 
 		public static readonly VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
 			"DeltaV (Current Stage)",
 			delegate()
 			{
-				if (SimManager.Stages == null || SimManager.LastStage == null)
-					return double.NaN;
-				return SimManager.LastStage.deltaV;
+			if (core.Stages == null || core.LastStage == null)
+					return double.NaN;
+				return core.LastStage.deltaV;
 			},
 			"m/s"
 		);
@@ -145,16 +172,16 @@
 			"DeltaV (Total)",
 			delegate()
 			{
-				if (SimManager.Stages == null || SimManager.LastStage == null)
-					return double.NaN;
-				return SimManager.LastStage.totalDeltaV;
+			if (core.Stages == null || core.LastStage == null)
+					return double.NaN;
+				return core.LastStage.totalDeltaV;
 			},
 			"m/s"
 		);
 
 		public static readonly VOID_FloatValue mainThrottle = new VOID_FloatValue(
 			"Throttle",
-			new Func<float>(() => VOID_Core.Instance.vessel.ctrlState.mainThrottle * 100f),
+			new Func<float>(() => core.vessel.ctrlState.mainThrottle * 100f),
 			"%"
 		);
 
@@ -162,11 +189,11 @@
 			"Thrust (curr/max)",
 			delegate()
 			{
-				if (SimManager.Stages == null || SimManager.LastStage == null)
+				if (core.Stages == null || core.LastStage == null)
 					return "N/A";
 
-				double currThrust = SimManager.LastStage.actualThrust;
-				double maxThrust = SimManager.LastStage.thrust;
+				double currThrust = core.LastStage.actualThrust;
+				double maxThrust = core.LastStage.thrust;
 
 				return string.Format(
 					"{0} / {1}",
@@ -180,12 +207,12 @@
 			"T:W Ratio",
 			delegate()
 		{
-			if (SimManager.LastStage == null)
+			if (core.LastStage == null)
 			{
 				return double.NaN;
 			}
 
-			return SimManager.LastStage.actualThrustToWeight;
+			return core.LastStage.actualThrustToWeight;
 		},
 			""
 		);
@@ -194,12 +221,12 @@
 			"T:W Ratio",
 			delegate()
 		{
-			if (SimManager.LastStage == null)
+			if (core.LastStage == null)
 			{
 				return double.NaN;
 			}
 
-			return SimManager.LastStage.maxThrustToWeight;
+			return core.LastStage.thrustToWeight;
 		},
 			""
 		);
@@ -208,7 +235,7 @@
 			"T:W (curr/max)",
 			delegate()
 			{
-				if (SimManager.Stages == null || SimManager.LastStage == null)
+				if (core.Stages == null || core.LastStage == null)
 					return "N/A";
 
 				return string.Format(
@@ -223,13 +250,13 @@
 			"Max T:W @ surface",
 			delegate()
 			{
-			if (SimManager.Stages == null || SimManager.LastStage == null)
-					return double.NaN;
-
-				double maxThrust = SimManager.LastStage.thrust;
-				double mass = SimManager.LastStage.totalMass;
-				double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
-				(VOID_Core.Instance.vessel.mainBody.Radius * VOID_Core.Instance.vessel.mainBody.Radius);
+			if (core.Stages == null || core.LastStage == null)
+					return double.NaN;
+
+				double maxThrust = core.LastStage.thrust;
+				double mass = core.LastStage.totalMass;
+				double gravity = (VOID_Core.Constant_G * core.vessel.mainBody.Mass) /
+				(core.vessel.mainBody.Radius * core.vessel.mainBody.Radius);
 				double weight = mass * gravity;
 
 				return maxThrust / weight;
@@ -247,7 +274,7 @@
 				currentAmount = 0d;
 				currentRequirement = 0d;
 
-				foreach (Part part in VOID_Core.Instance.vessel.Parts)
+				foreach (Part part in core.vessel.Parts)
 				{
 					if (part.enabled)
 					{

--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -58,7 +58,7 @@
 			}
 		}
 
-		public VOID_VesselRegister()
+		public VOID_VesselRegister() : base()
 		{
 			this._Name = "Vessel Register";
 
@@ -69,7 +69,7 @@
 
 		public override void ModuleWindow(int _)
 		{
-			if (!VOID_Core.Instance.allVesselTypes.Any())
+			if (!this.core.allVesselTypes.Any())
 			{
 				return;
 			}
@@ -80,33 +80,33 @@
 			if (GUILayout.Button("<"))
 			{
 				selectedBodyIdx--;
-				if (selectedBodyIdx < 0) selectedBodyIdx = VOID_Core.Instance.allBodies.Count - 1;
+				if (selectedBodyIdx < 0) selectedBodyIdx = this.core.allBodies.Count - 1;
 			}
-			GUILayout.Label(VOID_Core.Instance.allBodies[selectedBodyIdx].bodyName, VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(this.core.allBodies[selectedBodyIdx].bodyName, this.core.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
 			if (GUILayout.Button(">"))
 			{
 				selectedBodyIdx++;
-				if (selectedBodyIdx > VOID_Core.Instance.allBodies.Count - 1) selectedBodyIdx = 0;
+				if (selectedBodyIdx > this.core.allBodies.Count - 1) selectedBodyIdx = 0;
 			}
 			GUILayout.EndHorizontal();
 
-			seletedBody = VOID_Core.Instance.allBodies[selectedBodyIdx];
+			seletedBody = this.core.allBodies[selectedBodyIdx];
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			if (GUILayout.Button("<"))
 			{
 				selectedVesselTypeIdx--;
-				if (selectedVesselTypeIdx < 0) selectedVesselTypeIdx = VOID_Core.Instance.allVesselTypes.Count - 1;
+				if (selectedVesselTypeIdx < 0) selectedVesselTypeIdx = this.core.allVesselTypes.Count - 1;
 			}
-			GUILayout.Label(VOID_Core.Instance.allVesselTypes[selectedVesselTypeIdx].ToString(), VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
+			GUILayout.Label(this.core.allVesselTypes[selectedVesselTypeIdx].ToString(), this.core.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
 			if (GUILayout.Button(">"))
 			{
 				selectedVesselTypeIdx++;
-				if (selectedVesselTypeIdx > VOID_Core.Instance.allVesselTypes.Count - 1) selectedVesselTypeIdx = 0;
+				if (selectedVesselTypeIdx > this.core.allVesselTypes.Count - 1) selectedVesselTypeIdx = 0;
 			}
 			GUILayout.EndHorizontal();
 
-			selectedVesselType = VOID_Core.Instance.allVesselTypes[selectedVesselTypeIdx];
+			selectedVesselType = this.core.allVesselTypes[selectedVesselTypeIdx];
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			if (GUILayout.Button("Landed", GUILayout.ExpandWidth(true))) vesselSituation = "Landed";
@@ -116,7 +116,7 @@
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(
 				VOID_Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s  @ " + seletedBody.bodyName,
-				VOID_Core.Instance.LabelStyles["center"],
+				this.core.LabelStyles["center"],
 				GUILayout.ExpandWidth(true));
 			GUILayout.EndHorizontal();
 
@@ -142,7 +142,7 @@
 							if (_selectedVessel != v)
 							{
 								_selectedVessel = v; //set clicked vessel as selected_vessel
-								this._Active.value = true;    //turn bool on to open the window if closed
+								this.toggleActive = true;    //turn bool on to open the window if closed
 							}
 							else
 							{