Major reworking of the HUD underpinnings to be more modular and require less code duplication. Also made the Editor HUD movable, but for now it's stuck along the left edge.
Major reworking of the HUD underpinnings to be more modular and require less code duplication. Also made the Editor HUD movable, but for now it's stuck along the left edge.

--- a/IVOID_Module.cs
+++ b/IVOID_Module.cs
@@ -1,23 +1,31 @@
+// VOID
 //
-//  IVOID_Module.cs
+// IVOID_Module.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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 System;
 
 namespace VOID
@@ -43,6 +51,7 @@
 	{
 		void Update();
 		void FixedUpdate();
+		void OnDestroy();
 	}
 
 	public interface IVOID_EditorModule : IVOID_Module {}

file:a/IntCollection.cs (deleted)
--- a/IntCollection.cs
+++ /dev/null
@@ -1,81 +1,1 @@
-//
-//  IntCollection.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-using System;
 
-namespace VOID
-{
-	public class IntCollection
-	{
-		public static implicit operator long(IntCollection c)
-		{
-			return c.collection;
-		}
-
-		protected long mask;
-
-		public long collection { get; protected set; }
-		public ushort maxCount { get; protected set; }
-		public ushort wordLength { get; protected set; }
-
-		public IntCollection (ushort wordLength = 4, long initialCollection = 0)
-		{
-			this.collection = initialCollection;
-			this.wordLength = wordLength;
-			this.maxCount = (ushort)((sizeof(long) * 8 - 1) / wordLength);
-			this.mask = ((1 << this.wordLength) - 1);
-		}
-
-		public ushort this[int idx]
-		{
-			get {
-				if (idx < 0) {
-					idx += this.maxCount;
-				}
-
-				if (idx >= maxCount || idx < 0) {
-					throw new IndexOutOfRangeException ();
-				}
-
-				idx *= wordLength;
-
-				return (ushort)((this.collection & (this.mask << idx)) >> idx);
-			}
-			set {
-				if (idx < 0) {
-					idx += this.maxCount;
-				}
-
-				if (idx >= maxCount || idx < 0) {
-					throw new IndexOutOfRangeException ();
-				}
-
-				idx *= wordLength;
-
-				long packvalue = value & this.mask;
-
-				this.collection &= ~(this.mask << idx);
-				this.collection |= packvalue << idx;
-			}
-		}
-	}
-}
-
-

--- /dev/null
+++ b/Properties/AssemblyInfo.cs
@@ -1,1 +1,48 @@
+// VOID
+//
+// AssemblyInfo.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 System.Reflection;
+using System.Runtime.CompilerServices;
 
+[assembly: KSPAssemblyDependency("ToadicusTools", 0, 0)]
+[assembly: KSPAssemblyDependency("VesselSimulator", 0, 0)]
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+[assembly: AssemblyTitle("VOID")]
+[assembly: AssemblyDescription("A KSP mod that provides at-a-glance information about Vessels, Orbits, and their states.")]
+[assembly: AssemblyCopyright("toadicus")]
+// 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.16.*")]
+// 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)]
+//[assembly: AssemblyKeyFile("")]
+
+

file:a/ToolbarButtonWrapper.cs (deleted)
--- a/ToolbarButtonWrapper.cs
+++ /dev/null
@@ -1,505 +1,1 @@
-//
-//  ToolbarWrapper.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-using System;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
 
-namespace VOID
-{
-	/// <summary>
-	/// Wraps a Toolbar clickable button, after fetching it from a foreign assembly.
-	/// </summary>
-	internal class ToolbarButtonWrapper
-	{
-		protected static System.Type ToolbarManager;
-		protected static object TBManagerInstance;
-		protected static MethodInfo TBManagerAdd;
-
-		/// <summary>
-		/// Wraps the ToolbarManager class, if present.
-		/// </summary>
-		/// <returns><c>true</c>, if ToolbarManager is wrapped, <c>false</c> otherwise.</returns>
-		protected static bool TryWrapToolbarManager()
-		{
-			if (ToolbarManager == null)
-			{
-				Tools.PostDebugMessage(string.Format(
-					"{0}: Loading ToolbarManager.",
-					"ToolbarButtonWrapper"
-					));
-
-				ToolbarManager = AssemblyLoader.loadedAssemblies
-					.Select(a => a.assembly.GetExportedTypes())
-						.SelectMany(t => t)
-						.FirstOrDefault(t => t.FullName == "Toolbar.ToolbarManager");
-
-				Tools.PostDebugMessage(string.Format(
-					"{0}: Loaded ToolbarManager.  Getting Instance.",
-					"ToolbarButtonWrapper"
-					));
-
-				if (ToolbarManager == null)
-				{
-					return false;
-				}
-
-				TBManagerInstance = ToolbarManager.GetProperty(
-					"Instance",
-					System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static
-					)
-					.GetValue(null, null);
-
-				Tools.PostDebugMessage(string.Format(
-					"{0}: Got ToolbarManager Instance '{1}'.  Getting 'add' method.",
-					"ToolbarButtonWrapper",
-					TBManagerInstance
-					));
-
-				TBManagerAdd = ToolbarManager.GetMethod("add");
-
-				Tools.PostDebugMessage(string.Format(
-					"{0}: Got ToolbarManager Instance 'add' method.  Loading IButton.",
-					"ToolbarButtonWrapper"
-					));
-			}
-
-			return true;
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether <see cref="Toolbar.ToolbarManager"/> is present.
-		/// </summary>
-		/// <value><c>true</c>, if ToolbarManager is wrapped, <c>false</c> otherwise.</value>
-		public static bool ToolbarManagerPresent
-		{
-			get
-			{
-				return TryWrapToolbarManager();
-			}
-		}
-
-		/// <summary>
-		/// If ToolbarManager is present, initializes a new instance of the <see cref="VOID.ToolbarButtonWrapper"/> class.
-		/// </summary>
-		/// <param name="ns">Namespace, usually the plugin name.</param>
-		/// <param name="id">Identifier, unique per namespace.</param>
-		/// <returns>If ToolbarManager is present, a new <see cref="Toolbar.IButton"/> object, <c>null</c> otherwise.</returns>
-		public static ToolbarButtonWrapper TryWrapToolbarButton(string ns, string id)
-		{
-			if (ToolbarManagerPresent)
-			{
-				object button = TBManagerAdd.Invoke(TBManagerInstance, new object[] { ns, id });
-
-				Tools.PostDebugMessage(string.Format(
-					"{0}: Added Button '{1}' with ToolbarManager.  Getting 'Text' property",
-					"ToolbarButtonWrapper",
-					button.ToString()
-				));
-
-				return new ToolbarButtonWrapper(button);
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-		protected System.Type IButton;
-		protected object Button;
-		protected PropertyInfo ButtonText;
-		protected PropertyInfo ButtonTextColor;
-		protected PropertyInfo ButtonTexturePath;
-		protected PropertyInfo ButtonToolTip;
-		protected PropertyInfo ButtonVisible;
-		protected PropertyInfo ButtonVisibility;
-		protected PropertyInfo ButtonEnalbed;
-		protected PropertyInfo ButtonImportant;
-		protected EventInfo ButtonOnClick;
-		protected EventInfo ButtonOnMouseEnter;
-		protected EventInfo ButtonOnMouseLeave;
-		protected MethodInfo ButtonDestroy;
-		protected System.Type GameScenesVisibilityType;
-
-		/// <summary>
-		/// The text displayed on the button. Set to null to hide text.
-		/// </summary>
-		/// <remarks>
-		/// The text can be changed at any time to modify the button's appearance. Note that since this will also
-		/// modify the button's size, this feature should be used sparingly, if at all.
-		/// </remarks>
-		/// <seealso cref="TexturePath"/>
-		public string Text
-		{
-			get
-			{
-				return this.ButtonText.GetValue(this.Button, null) as String;
-			}
-			set
-			{
-				this.ButtonText.SetValue(this.Button, value, null);
-			}
-		}
-
-		/// <summary>
-		/// The color the button text is displayed with. Defaults to Color.white.
-		/// </summary>
-		/// <remarks>
-		/// The text color can be changed at any time to modify the button's appearance.
-		/// </remarks>
-		public Color TextColor
-		{
-			get
-			{
-				return (Color)this.ButtonTextColor.GetValue(this.Button, null);
-			}
-			set
-			{
-				this.ButtonTextColor.SetValue(this.Button, value, null);
-			}
-		}
-
-		/// <summary>
-		/// The path of a texture file to display an icon on the button. Set to null to hide icon.
-		/// </summary>
-		/// <remarks>
-		/// <para>
-		/// A texture path on a button will have precedence over text. That is, if both text and texture path
-		/// have been set on a button, the button will show the texture, not the text.
-		/// </para>
-		/// <para>
-		/// The texture size must not exceed 24x24 pixels.
-		/// </para>
-		/// <para>
-		/// The texture path must be relative to the "GameData" directory, and must not specify a file name suffix.
-		/// Valid example: MyAddon/Textures/icon_mybutton
-		/// </para>
-		/// <para>
-		/// The texture path can be changed at any time to modify the button's appearance.
-		/// </para>
-		/// </remarks>
-		/// <seealso cref="Text"/>
-		public string TexturePath
-		{
-			get
-			{
-				return this.ButtonTexturePath.GetValue(this.Button, null) as string;
-			}
-			set
-			{
-				this.ButtonTexturePath.SetValue(this.Button, value, null);
-			}
-		}
-
-		/// <summary>
-		/// The button's tool tip text. Set to null if no tool tip is desired.
-		/// </summary>
-		/// <remarks>
-		/// Tool Tip Text Should Always Use Headline Style Like This.
-		/// </remarks>
-		public string ToolTip
-		{
-			get
-			{
-				return this.ButtonToolTip.GetValue(this.Button, null) as string;
-			}
-			set
-			{
-				this.ButtonToolTip.SetValue(this.Button, value, null);
-			}
-		}
-
-		/// <summary>
-		/// Whether this button is currently visible or not. Can be used in addition to or as a replacement for <see cref="Visibility"/>.
-		/// </summary>
-		public bool Visible
-		{
-			get
-			{
-				return (bool)this.ButtonVisible.GetValue(this.Button, null);
-			}
-			set
-			{
-				this.ButtonVisible.SetValue(this.Button, value, null);
-			}
-		}
-
-		/// <summary>
-		/// Whether this button is currently enabled (clickable) or not. This will not affect the player's ability to
-		/// position the button on their screen.
-		/// </summary>
-		public bool Enabled
-		{
-			get
-			{
-				return (bool)this.ButtonEnalbed.GetValue(this.Button, null);
-			}
-			set
-			{
-				this.ButtonEnalbed.SetValue(this.Button, value, null);
-			}
-		}
-
-		/// <summary>
-		/// Whether this button is currently "important."  Set to false to return to normal button behaviour.
-		/// </summary>
-		/// <remarks>
-		/// <para>
-		/// This can be used to temporarily force the button to be shown on the screen regardless of the toolbar being
-		/// currently in auto-hidden mode.  For example, a button that signals the arrival of a private message in a
-		/// chat room could mark itself as "important" as long as the message has not been read.
-		/// </para>
-		/// <para>
-		/// Setting this property does not change the appearance of the button.  use <see cref="TexturePath"/>  to
-		/// change the button's icon.
-		/// </para>
-		/// <para>
-		/// This feature should be used only sparingly, if at all, since it forces the button to be displayed on screen
-		/// even when it normally wouldn't.
-		/// </para>
-		/// </remarks>
-		/// <value><c>true</c> if important; otherwise, <c>false</c>.</value>
-		public bool Important
-		{
-			get
-			{
-				return (bool)this.ButtonImportant.GetValue(this.Button, null);
-			}
-			set
-			{
-				this.ButtonImportant.SetValue(this.Button, value, null);
-			}
-		}
-
-		private ToolbarButtonWrapper()
-		{
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="VOID.ToolbarButtonWrapper"/> class.
-		/// </summary>
-		/// <param name="ns">Namespace, usually the plugin name.</param>
-		/// <param name="id">Identifier, unique per namespace.</param>
-		protected ToolbarButtonWrapper(object button)
-		{
-			this.Button = button;
-
-			this.IButton = AssemblyLoader.loadedAssemblies
-				.Select(a => a.assembly.GetExportedTypes())
-				.SelectMany(t => t)
-				.FirstOrDefault(t => t.FullName == "Toolbar.IButton");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Loaded IButton.  Adding Button with ToolbarManager.",
-				this.GetType().Name
-			));
-
-			this.ButtonText = this.IButton.GetProperty("Text");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'Text' property.  Getting 'TextColor' property.",
-				this.GetType().Name
-			));
-
-			this.ButtonTextColor = this.IButton.GetProperty("TextColor");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'TextColor' property.  Getting 'TexturePath' property.",
-				this.GetType().Name
-			));
-
-			this.ButtonTexturePath = this.IButton.GetProperty("TexturePath");
-			
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'TexturePath' property.  Getting 'ToolTip' property.",
-				this.GetType().Name
-			));
-
-			this.ButtonToolTip = this.IButton.GetProperty("ToolTip");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'ToolTip' property.  Getting 'Visible' property.",
-				this.GetType().Name
-			));
-
-			this.ButtonVisible = this.IButton.GetProperty("Visible");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'Visible' property.  Getting 'Visibility' property.",
-				this.GetType().Name
-			));
-
-			this.ButtonVisibility = this.IButton.GetProperty("Visibility");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'Visibility' property.  Getting 'Enabled' property.",
-				this.GetType().Name
-			));
-
-			this.ButtonEnalbed = this.IButton.GetProperty("Enabled");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'Enabled' property.  Getting 'OnClick' event.",
-				this.GetType().Name
-			));
-
-			this.ButtonImportant = this.IButton.GetProperty("Important");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'Enabled' property.  Getting 'OnClick' event.",
-				this.GetType().Name
-			));
-
-			this.ButtonOnClick = this.IButton.GetEvent("OnClick");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'OnClick' event '{1}'.  Getting 'OnMouseEnter' event.",
-				this.GetType().Name,
-				this.ButtonOnClick.ToString()
-			));
-
-			this.ButtonOnMouseEnter = this.IButton.GetEvent("OnMouseEnter");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'OnMouseEnter' event '{1}'.  Getting 'OnMouseLeave' event.",
-				this.GetType().Name,
-				this.ButtonOnClick.ToString()
-				));
-
-			this.ButtonOnMouseLeave = this.IButton.GetEvent("OnMouseLeave");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'OnMouseLeave' event '{1}'.  Getting 'Destroy' method.",
-				this.GetType().Name,
-				this.ButtonOnClick.ToString()
-				));
-
-			this.ButtonDestroy = this.IButton.GetMethod("Destroy");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'Destroy' property '{1}'.  Loading GameScenesVisibility class.",
-				this.GetType().Name,
-				this.ButtonDestroy.ToString()
-			));
-
-			this.GameScenesVisibilityType = AssemblyLoader.loadedAssemblies
-				.Select(a => a.assembly.GetExportedTypes())
-					.SelectMany(t => t)
-					.FirstOrDefault(t => t.FullName == "Toolbar.GameScenesVisibility");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'GameScenesVisibility' class '{1}'.",
-				this.GetType().Name,
-				this.GameScenesVisibilityType.ToString()
-			));
-
-			Tools.PostDebugMessage("ToolbarButtonWrapper built!");
-		}
-
-		/// <summary>
-		/// Adds event handler to receive "on click" events.
-		/// </summary>
-		/// <example>
-		/// <code>
-		/// ToolbarButtonWrapper button = ...
-		/// button.AddButtonClickHandler(
-		/// 	(e) =>
-		/// 	{
-		/// 		Debug.Log("button clicked, mouseButton: " + e.Mousebutton");
-		/// 	}
-		/// );
-		/// </code>
-		/// </example>
-		/// <param name="Handler">Delegate to handle "on click" events</param>
-		public void AddButtonClickHandler(Action<object> Handler)
-		{
-			this.AddButtonEventHandler(this.ButtonOnClick, Handler);
-		}
-
-		/// <summary>
-		/// Adds event handler that can be registered with to receive "on mouse enter" events.
-		/// </summary>
-		/// <example>
-		/// <code>
-		/// ToolbarWrapperButton button = ...
-		/// button.AddButtonOnMouseEnterHandler(
-		/// 	(e) =>
-		/// 	{
-		/// 		Debug.Log("mouse entered button");
-		/// 	}
-		/// );
-		/// </code>
-		/// </example>
-		/// <param name="Handler">Delegate to handle "OnMouseEnter" events.</param>
-		public void AddButtonOnMouseEnterHandler(Action<object> Handler)
-		{
-			this.AddButtonEventHandler(this.ButtonOnMouseEnter, Handler);
-		}
-
-		/// <summary>
-		/// Adds event handler that can be registered with to receive "on mouse leave" events.
-		/// </summary>
-		/// <example>
-		/// <code>
-		/// ToolbarWrapperButton button = ...
-		/// button.AddButtonOnMouseLeaveHandler(
-		/// 	(e) =>
-		/// 	{
-		/// 		Debug.Log("mouse left button");
-		/// 	}
-		/// );
-		/// </code>
-		/// </example>
-		/// <param name="Handler">Delegate to handle "OnMouseLeave" events.</param>
-		public void AddButtonOnMouseLeaveHandler(Action<object> Handler)
-		{
-			this.AddButtonEventHandler(this.ButtonOnMouseLeave, Handler);
-		}
-
-		/// <summary>
-		/// Sets this button's visibility. Can be used in addition to or as a replacement for <see cref="Visible"/>.
-		/// </summary>
-		/// <param name="gameScenes">Array of GameScene objects in which the button should be visible.</param>
-		public void SetButtonVisibility(params GameScenes[] gameScenes)
-		{
-			object GameScenesVisibilityObj = Activator.CreateInstance(this.GameScenesVisibilityType, gameScenes);
-			this.ButtonVisibility.SetValue(this.Button, GameScenesVisibilityObj, null);
-		}
-
-		/// <summary>
-		/// Permanently destroys this button so that it is no longer displayed.
-		/// Should be used when a plugin is stopped to remove leftover buttons.
-		/// </summary>
-		public void Destroy()
-		{
-			this.ButtonDestroy.Invoke(this.Button, null);
-		}
-
-		// Utility method for use with the AddButton<event>Handler API methods.
-		protected void AddButtonEventHandler(EventInfo Event, Action<object> Handler)
-		{
-			Delegate d = Delegate.CreateDelegate(Event.EventHandlerType, Handler.Target, Handler.Method);
-			MethodInfo addHandler = Event.GetAddMethod();
-			addHandler.Invoke(this.Button, new object[] { d });
-		}
-	}
-}
-

file:a/Tools.cs (deleted)
--- a/Tools.cs
+++ /dev/null
@@ -1,1029 +1,1 @@
-//
-//  Tools.cs
-//
-//  Author:
-//       toadicus
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//  This software uses VesselSimulator and Engineer.Extensions from Engineer Redux.
-//  Engineer Redux (c) 2013 cybutek
-//  Used by permission.
-//
-///////////////////////////////////////////////////////////////////////////////
 
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace VOID
-{
-	public static class VOIDLabels
-	{
-		public static string void_primary = "Primary";
-		public static string void_altitude_asl = "Altitude (ASL)";
-		public static string void_velocity = "Velocity";
-		public static string void_apoapsis = "Apoapsis";
-		public static string void_periapsis = "Periapsis";
-	}
-
-	public static class Tools
-	{
-		// Toadicus edit: Added re-implementation of the CBAttributeMap.GetAtt function that does not fire a debug message to the game screen.
-		public static CBAttributeMap.MapAttribute Toadicus_GetAtt(Vessel vessel)
-		{
-			CBAttributeMap.MapAttribute mapAttribute;
-
-			try
-			{
-				CBAttributeMap BiomeMap = vessel.mainBody.BiomeMap;
-
-				double lat = vessel.latitude * Math.PI / 180d;
-				double lon = vessel.longitude * Math.PI / 180d;
-
-				mapAttribute = BiomeMap.GetAtt(lat, lon);
-
-				/*
-				lon -= Math.PI / 2d;
-
-				if (lon < 0d)
-				{
-					lon += 2d * Math.PI;
-				}
-
-				float v = (float)(lat / Math.PI) + 0.5f;
-				float u = (float)(lon / (2d * Math.PI));
-
-				Color pixelBilinear = BiomeMap.Map.GetPixelBilinear(u, v);
-				mapAttribute = BiomeMap.defaultAttribute;
-
-				if (BiomeMap.Map != null)
-				{
-					if (BiomeMap.exactSearch)
-					{
-						for (int i = 0; i < BiomeMap.Attributes.Length; ++i)
-						{
-							if (pixelBilinear == BiomeMap.Attributes[i].mapColor)
-							{
-								mapAttribute = BiomeMap.Attributes[i];
-							}
-						}
-					}
-					else
-					{
-						float zero = 0;
-						float num = 1 / zero;
-						for (int j = 0; j < BiomeMap.Attributes.Length; ++j)
-						{
-							Color mapColor = BiomeMap.Attributes[j].mapColor;
-							float sqrMagnitude = ((Vector4)(mapColor - pixelBilinear)).sqrMagnitude;
-							if (sqrMagnitude < num)
-							{
-								bool testCase = true;
-								if (BiomeMap.nonExactThreshold != -1)
-								{
-									testCase = (sqrMagnitude < BiomeMap.nonExactThreshold);
-								}
-								if (testCase)
-								{
-									mapAttribute = BiomeMap.Attributes[j];
-									num = sqrMagnitude;
-								}
-							}
-						}
-					}
-				}
-				*/
-			}
-			catch (NullReferenceException)
-			{
-				mapAttribute = new CBAttributeMap.MapAttribute();
-				mapAttribute.name = "N/A";
-			}
-
-			return mapAttribute;
-		}
-
-		public static string GetLongitudeString(Vessel vessel, string format = "F4")
-		{
-			string dir_long = "W";
-			double v_long = vessel.longitude;
-
-			v_long = FixDegreeDomain(v_long);
-
-			if (v_long < -180d)
-			{
-				v_long += 360d;
-			}
-			if (v_long >= 180)
-			{
-				v_long -= 360d;
-			}
-
-			if (v_long > 0)
-				dir_long = "E";
-
-			return string.Format("{0}° {1}", Math.Abs(v_long).ToString(format), dir_long);
-		}
-
-		public static string GetLatitudeString(Vessel vessel, string format = "F4")
-		{
-			string dir_lat = "S";
-			double v_lat = vessel.latitude;
-			if (v_lat > 0)
-				dir_lat = "N";
-
-			return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
-		}
-
-		///////////////////////////////////////////////////////////////////////////////
-
-		//For MuMech_get_heading()
-		public class MuMech_MovingAverage
-		{
-			private double[] store;
-			private int storeSize;
-			private int nextIndex = 0;
-
-			public double value
-			{
-				get
-				{
-					double tmp = 0;
-					foreach (double i in store)
-					{
-						tmp += i;
-					}
-					return tmp / storeSize;
-				}
-				set
-				{
-					store[nextIndex] = value;
-					nextIndex = (nextIndex + 1) % storeSize;
-				}
-			}
-
-			public MuMech_MovingAverage(int size = 10, double startingValue = 0)
-			{
-				storeSize = size;
-				store = new double[size];
-				force(startingValue);
-			}
-
-			public void force(double newValue)
-			{
-				for (int i = 0; i < storeSize; i++)
-				{
-					store[i] = newValue;
-				}
-			}
-
-			public static implicit operator double(MuMech_MovingAverage v)
-			{
-				return v.value;
-			}
-
-			public override string ToString()
-			{
-				return value.ToString();
-			}
-
-			public string ToString(string format)
-			{
-				return value.ToString(format);
-			}
-		}
-		//From http://svn.mumech.com/KSP/trunk/MuMechLib/VOID.vesselState.cs
-		public static double MuMech_get_heading(Vessel vessel)
-		{
-			Vector3d CoM = vessel.findWorldCenterOfMass();
-			Vector3d up = (CoM - vessel.mainBody.position).normalized;
-			Vector3d north = Vector3d.Exclude(
-				                 up,
-				                 (vessel.mainBody.position +
-				                 vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
-				                 ) - CoM).normalized;
-
-			Quaternion rotationSurface = Quaternion.LookRotation(north, up);
-			Quaternion rotationvesselSurface = Quaternion.Inverse(
-				                                   Quaternion.Euler(90, 0, 0) *
-				                                   Quaternion.Inverse(vessel.transform.rotation) *
-				                                   rotationSurface);
-
-			return rotationvesselSurface.eulerAngles.y;
-		}
-		//From http://svn.mumech.com/KSP/trunk/MuMechLib/MuUtils.cs
-		public static string MuMech_ToSI(
-			double d, int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue
-		)
-		{
-			float exponent = (float)Math.Log10(Math.Abs(d));
-			exponent = Mathf.Clamp(exponent, (float)MinMagnitude, (float)MaxMagnitude);
-
-			if (exponent >= 0)
-			{
-				switch ((int)Math.Floor(exponent))
-				{
-					case 0:
-					case 1:
-					case 2:
-						return d.ToString("F" + digits);
-					case 3:
-					case 4:
-					case 5:
-						return (d / 1e3).ToString("F" + digits) + "k";
-					case 6:
-					case 7:
-					case 8:
-						return (d / 1e6).ToString("F" + digits) + "M";
-					case 9:
-					case 10:
-					case 11:
-						return (d / 1e9).ToString("F" + digits) + "G";
-					case 12:
-					case 13:
-					case 14:
-						return (d / 1e12).ToString("F" + digits) + "T";
-					case 15:
-					case 16:
-					case 17:
-						return (d / 1e15).ToString("F" + digits) + "P";
-					case 18:
-					case 19:
-					case 20:
-						return (d / 1e18).ToString("F" + digits) + "E";
-					case 21:
-					case 22:
-					case 23:
-						return (d / 1e21).ToString("F" + digits) + "Z";
-					default:
-						return (d / 1e24).ToString("F" + digits) + "Y";
-				}
-			}
-			else if (exponent < 0)
-			{
-				switch ((int)Math.Floor(exponent))
-				{
-					case -1:
-					case -2:
-					case -3:
-						return (d * 1e3).ToString("F" + digits) + "m";
-					case -4:
-					case -5:
-					case -6:
-						return (d * 1e6).ToString("F" + digits) + "μ";
-					case -7:
-					case -8:
-					case -9:
-						return (d * 1e9).ToString("F" + digits) + "n";
-					case -10:
-					case -11:
-					case -12:
-						return (d * 1e12).ToString("F" + digits) + "p";
-					case -13:
-					case -14:
-					case -15:
-						return (d * 1e15).ToString("F" + digits) + "f";
-					case -16:
-					case -17:
-					case -18:
-						return (d * 1e18).ToString("F" + digits) + "a";
-					case -19:
-					case -20:
-					case -21:
-						return (d * 1e21).ToString("F" + digits) + "z";
-					default:
-						return (d * 1e24).ToString("F" + digits) + "y";
-				}
-			}
-			else
-			{
-				return "0";
-			}
-		}
-
-		public static string ConvertInterval(double seconds)
-		{
-			string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:D2}.{5:D1}s";
-			string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:D2}.{4:D1}s";
-			string format_3 = "{0:D2}h {1:D2}m {2:D2}.{3:D1}s";
-
-			TimeSpan interval;
-
-			try
-			{
-				interval = TimeSpan.FromSeconds(seconds);
-			}
-			catch (OverflowException)
-			{
-				return "NaN";
-			}
-
-			int years = interval.Days / 365;
-
-			string output;
-			if (years > 0)
-			{
-				output = string.Format(format_1,
-					years,
-					interval.Days - (years * 365), //  subtract years * 365 for accurate day count
-					interval.Hours,
-					interval.Minutes,
-					interval.Seconds,
-					interval.Milliseconds.ToString().Substring(0, 1));
-			}
-			else if (interval.Days > 0)
-			{
-				output = string.Format(format_2,
-					interval.Days,
-					interval.Hours,
-					interval.Minutes,
-					interval.Seconds,
-					interval.Milliseconds.ToString().Substring(0, 1));
-			}
-			else
-			{
-				output = string.Format(format_3,
-					interval.Hours,
-					interval.Minutes,
-					interval.Seconds,
-					interval.Milliseconds.ToString().Substring(0, 1));
-			}
-			return output;
-		}
-
-		public static string UppercaseFirst(string s)
-		{
-			if (string.IsNullOrEmpty(s))
-			{
-				return string.Empty;
-			}
-			char[] a = s.ToCharArray();
-			a[0] = char.ToUpper(a[0]);
-			return new string(a);
-		}
-		//transfer angles
-		public static double Nivvy_CalcTransferPhaseAngle(double r_current, double r_target, double grav_param)
-		{
-			double T_target = (2 * Math.PI) * Math.Sqrt(Math.Pow((r_target / 1000), 3) / (grav_param / 1000000000));
-			double T_transfer = (2 * Math.PI) * Math.Sqrt(Math.Pow((((r_target / 1000) + (r_current / 1000)) / 2), 3) / (grav_param / 1000000000));
-			return 360 * (0.5 - (T_transfer / (2 * T_target)));
-		}
-
-		public static double Younata_DeltaVToGetToOtherBody(double mu, double r1, double r2)
-		{
-			/*			
-            def deltaVToGetToOtherBody(mu, r1, r2):
-            # mu = gravity param of common orbiting body of r1 and r2
-            # (e.g. for mun to minmus, mu is kerbin's gravity param
-            # r1 = initial body's orbit radius
-            # r2 = target body's orbit radius
-		
-            # return value is km/s
-            sur1 = math.sqrt(mu / r1)
-            sr1r2 = math.sqrt(float(2*r2)/float(r1+r2))
-            mult = sr1r2 - 1
-            return sur1 * mult
-            */
-			double sur1, sr1r2, mult;
-			sur1 = Math.Sqrt(mu / r1);
-			sr1r2 = Math.Sqrt((2 * r2) / (r1 + r2));
-			mult = sr1r2 - 1;
-			return sur1 * mult;
-		}
-
-		public static double Younata_DeltaVToExitSOI(double mu, double r1, double r2, double v)
-		{
-			/*			
-            def deltaVToExitSOI(mu, r1, r2, v):
-            # mu = gravity param of current body
-            # r1 = current orbit radius
-            # r2 = SOI radius
-            # v = SOI exit velocity
-            foo = r2 * (v**2) - 2 * mu
-            bar = r1 * foo + (2 * r2 * mu)
-            r = r1*r2
-            return math.sqrt(bar / r)
-            */
-			double foo = r2 * Math.Pow(v, 2) - 2 * mu;
-			double bar = r1 * foo + (2 * r2 * mu);
-			double r = r1 * r2;
-			return Math.Sqrt(bar / r);
-		}
-
-		public static double Younata_TransferBurnPoint(double r, double v, double angle, double mu)
-		{
-			/*			
-            def transferBurnPoint(r, v, angle, mu):
-            # r = parking orbit radius
-            # v = ejection velocity
-            # angle = phase angle (from function phaseAngle())
-            # mu = gravity param of current body.
-            epsilon = ((v**2)/2) - (mu / r)
-            h = r * v * math.sin(angle)
-            e = math.sqrt(1 + ((2 * epsilon * h**2)/(mu**2)))
-            theta = math.acos(1.0 / e)
-            degrees = theta * (180.0 / math.pi)
-            return 180 - degrees
-            */
-			double epsilon, h, ee, theta, degrees;
-			epsilon = (Math.Pow(v, 2) / 2) - (mu / r);
-			h = r * v * Math.Sin(angle);
-			ee = Math.Sqrt(1 + ((2 * epsilon * Math.Pow(h, 2)) / Math.Pow(mu, 2)));
-			theta = Math.Acos(1.0 / ee);
-			degrees = theta * (180.0 / Math.PI);
-			return 180 - degrees;
-			// returns the ejection angle
-		}
-
-		public static double Adammada_CurrrentPhaseAngle(
-			double body_LAN,
-			double body_orbitPct,
-			double origin_LAN,
-			double origin_orbitPct
-		)
-		{
-			double angle = (body_LAN / 360 + body_orbitPct) - (origin_LAN / 360 + origin_orbitPct);
-			if (angle > 1)
-				angle = angle - 1;
-			if (angle < 0)
-				angle = angle + 1;
-			if (angle > 0.5)
-				angle = angle - 1;
-			angle = angle * 360;
-			return angle;
-		}
-
-		public static double Adammada_CurrentEjectionAngle(
-			double vessel_long,
-			double origin_rotAngle,
-			double origin_LAN,
-			double origin_orbitPct
-		)
-		{
-			//double eangle = ((FlightGlobals.ActiveVOID.vessel.longitude + orbiting.rotationAngle) - (orbiting.orbit.LAN / 360 + orbiting.orbit.orbitPercent) * 360);
-			double eangle = ((vessel_long + origin_rotAngle) - (origin_LAN / 360 + origin_orbitPct) * 360);
-
-			while (eangle < 0)
-				eangle = eangle + 360;
-			while (eangle > 360)
-				eangle = eangle - 360;
-			if (eangle < 270)
-				eangle = 90 - eangle;
-			else
-				eangle = 450 - eangle;
-			return eangle;
-		}
-
-		public static double mrenigma03_calcphase(Vessel vessel, CelestialBody target)   //calculates phase angle between the current body and target body
-		{
-			Vector3d vecthis = new Vector3d();
-			Vector3d vectarget = new Vector3d();
-			vectarget = target.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
-
-			if ((vessel.mainBody.name == "Sun") || (vessel.mainBody.referenceBody.referenceBody.name == "Sun"))
-			{
-				vecthis = vessel.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
-			}
-			else
-			{
-				vecthis = vessel.mainBody.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
-			}
-
-			vecthis = Vector3d.Project(new Vector3d(vecthis.x, 0, vecthis.z), vecthis);
-			vectarget = Vector3d.Project(new Vector3d(vectarget.x, 0, vectarget.z), vectarget);
-
-			Vector3d prograde = new Vector3d();
-			prograde = Quaternion.AngleAxis(90, Vector3d.forward) * vecthis;
-
-			double phase = Vector3d.Angle(vecthis, vectarget);
-
-			if (Vector3d.Angle(prograde, vectarget) > 90)
-				phase = 360 - phase;
-
-			return (phase + 360) % 360;
-		}
-
-		public static double FixAngleDomain(double Angle, bool Degrees = false)
-		{
-			double Extent = 2d * Math.PI;
-			if (Degrees)
-			{
-				Extent = 360d;
-			}
-
-			Angle = Angle % (Extent);
-			if (Angle < 0d)
-			{
-				Angle += Extent;
-			}
-
-			return Angle;
-		}
-
-		public static double FixDegreeDomain(double Angle)
-		{
-			return FixAngleDomain(Angle, true);
-		}
-
-		public static double adjustCurrPhaseAngle(double transfer_angle, double curr_phase)
-		{
-			if (transfer_angle < 0)
-			{
-				if (curr_phase > 0)
-					return (-1 * (360 - curr_phase));
-				else if (curr_phase < 0)
-					return curr_phase;
-			}
-			else if (transfer_angle > 0)
-			{
-				if (curr_phase > 0)
-					return curr_phase;
-				else if (curr_phase < 0)
-					return (360 + curr_phase);
-			}
-			return curr_phase;
-		}
-
-		public static double adjust_current_ejection_angle(double curr_ejection)
-		{
-			//curr_ejection WILL need to be adjusted once for all transfers as it returns values ranging -180 to 180
-			// need 0-360 instead
-			//
-			// ie i have -17 in the screenshot
-			// need it to show 343
-			//
-			// do this
-			//
-			// if < 0, add curr to 360  // 360 + (-17) = 343
-			// else its good as it is
-
-			if (curr_ejection < 0)
-				return 360 + curr_ejection;
-			else
-				return curr_ejection;
-
-		}
-
-		public static double adjust_transfer_ejection_angle(double trans_ejection, double trans_phase)
-		{
-			// if transfer_phase_angle < 0 its a lower transfer
-			//180 + curr_ejection
-			// else if transfer_phase_angle > 0 its good as it is
-
-			if (trans_phase < 0)
-				return 180 + trans_ejection;
-			else
-				return trans_ejection;
-
-		}
-
-		public static double TrueAltitude(Vessel vessel)
-		{
-			double trueAltitude = vessel.orbit.altitude - 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 (vessel.terrainAltitude < 0 && vessel.mainBody.ocean)
-			{
-				trueAltitude = vessel.orbit.altitude;
-			}
-
-			return trueAltitude;
-		}
-
-		public static string get_heading_text(double heading)
-		{
-			if (heading > 348.75 || heading <= 11.25)
-				return "N";
-			else if (heading > 11.25 && heading <= 33.75)
-				return "NNE";
-			else if (heading > 33.75 && heading <= 56.25)
-				return "NE";
-			else if (heading > 56.25 && heading <= 78.75)
-				return "ENE";
-			else if (heading > 78.75 && heading <= 101.25)
-				return "E";
-			else if (heading > 101.25 && heading <= 123.75)
-				return "ESE";
-			else if (heading > 123.75 && heading <= 146.25)
-				return "SE";
-			else if (heading > 146.25 && heading <= 168.75)
-				return "SSE";
-			else if (heading > 168.75 && heading <= 191.25)
-				return "S";
-			else if (heading > 191.25 && heading <= 213.75)
-				return "SSW";
-			else if (heading > 213.75 && heading <= 236.25)
-				return "SW";
-			else if (heading > 236.25 && heading <= 258.75)
-				return "WSW";
-			else if (heading > 258.75 && heading <= 281.25)
-				return "W";
-			else if (heading > 281.25 && heading <= 303.75)
-				return "WNW";
-			else if (heading > 303.75 && heading <= 326.25)
-				return "NW";
-			else if (heading > 326.25 && heading <= 348.75)
-				return "NNW";
-			else
-				return "";
-		}
-
-		public static void display_transfer_angles_SUN2PLANET(CelestialBody body, Vessel vessel)
-		{
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(
-				Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(
-					vessel.orbit.semiMajorAxis,
-					body.orbit.semiMajorAxis,
-					vessel.mainBody.gravParameter
-				).ToString("F3") + "°",
-				GUILayout.ExpandWidth(false)
-			);
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Transfer velocity:");
-			GUILayout.Label(
-				(Tools.Younata_DeltaVToGetToOtherBody(
-					(vessel.mainBody.gravParameter / 1000000000),
-					(vessel.orbit.semiMajorAxis / 1000),
-					(body.orbit.semiMajorAxis / 1000)
-				) * 1000).ToString("F2") + "m/s",
-				GUILayout.ExpandWidth(false)
-			);
-			GUILayout.EndHorizontal();
-		}
-
-		public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
-		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
-				             (vessel.mainBody.referenceBody.gravParameter / 1000000000),
-				             (vessel.mainBody.orbit.semiMajorAxis / 1000),
-				             (body.orbit.semiMajorAxis / 1000)
-			             );
-			double dv2 = Tools.Younata_DeltaVToExitSOI(
-				             (vessel.mainBody.gravParameter / 1000000000),
-				             (vessel.orbit.semiMajorAxis / 1000),
-				             (vessel.mainBody.sphereOfInfluence / 1000),
-				             Math.Abs(dv1)
-			             );
-
-			double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
-				                              (vessel.orbit.semiMajorAxis / 1000),
-				                              dv2,
-				                              (Math.PI / 2.0),
-				                              (vessel.mainBody.gravParameter / 1000000000)
-			                              );
-			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
-				                             FlightGlobals.ActiveVessel.longitude,
-				                             FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
-				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
-				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
-			                             );
-
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
-				                           vessel.mainBody.orbit.semiMajorAxis,
-				                           body.orbit.semiMajorAxis,
-				                           vessel.mainBody.referenceBody.gravParameter
-			                           ) % 360;
-			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
-				                          body.orbit.LAN,
-				                          body.orbit.orbitPercent,
-				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
-				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
-			                          );
-
-			double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
-			double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
-			double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(
-				adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
-				GUILayout.ExpandWidth(false)
-			);
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Ejection angle (curr/trans):");
-			GUILayout.Label(
-				adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
-				GUILayout.ExpandWidth(false)
-			);
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Transfer velocity:");
-			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-		}
-
-		public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
-		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
-				             (vessel.mainBody.gravParameter / 1000000000),
-				             (vessel.orbit.semiMajorAxis / 1000),
-				             (body.orbit.semiMajorAxis / 1000)
-			             );
-
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
-				                           vessel.orbit.semiMajorAxis,
-				                           body.orbit.semiMajorAxis,
-				                           vessel.mainBody.gravParameter
-			                           );
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(
-				Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
-				GUILayout.ExpandWidth(false)
-			);
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Transfer velocity:");
-			GUILayout.Label((dv1 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-		}
-
-		public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
-		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
-				             (vessel.mainBody.referenceBody.gravParameter / 1000000000),
-				             (vessel.mainBody.orbit.semiMajorAxis / 1000),
-				             (body.orbit.semiMajorAxis / 1000)
-			             );
-			double dv2 = Tools.Younata_DeltaVToExitSOI(
-				             (vessel.mainBody.gravParameter / 1000000000),
-				             (vessel.orbit.semiMajorAxis / 1000),
-				             (vessel.mainBody.sphereOfInfluence / 1000),
-				             Math.Abs(dv1)
-			             );
-			double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
-				                              (vessel.orbit.semiMajorAxis / 1000),
-				                              dv2,
-				                              (Math.PI / 2.0),
-				                              (vessel.mainBody.gravParameter / 1000000000)
-			                              );
-
-			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
-				                          body.orbit.LAN,
-				                          body.orbit.orbitPercent,
-				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
-				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
-			                          );
-			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
-				                             FlightGlobals.ActiveVessel.longitude,
-				                             FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
-				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
-				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
-			                             );
-
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
-				                           vessel.mainBody.orbit.semiMajorAxis,
-				                           body.orbit.semiMajorAxis,
-				                           vessel.mainBody.referenceBody.gravParameter
-			                           ) % 360;
-
-			double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
-			//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
-
-			//new stuff
-			//
-			double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
-			double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
-			//
-			//
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(
-				adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
-				GUILayout.ExpandWidth(false)
-			);
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Ejection angle (curr/trans):");
-			GUILayout.Label(
-				adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
-				GUILayout.ExpandWidth(false)
-			);
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Transfer velocity:");
-			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-		}
-		// This implementation is adapted from FARGUIUtils.ClampToScreen
-		public static Rect ClampRectToScreen(Rect window, int xMargin, int yMargin)
-		{
-			window.x = Mathf.Clamp(window.x, xMargin - window.width, Screen.width - xMargin);
-			window.y = Mathf.Clamp(window.y, yMargin - window.height, Screen.height - yMargin);
-
-			return window;
-		}
-
-		public static Rect ClampRectToScreen(Rect window, int Margin)
-		{
-			return ClampRectToScreen(window, Margin, Margin);
-		}
-
-		public static Rect ClampRectToScreen(Rect window)
-		{
-			return ClampRectToScreen(window, 30);
-		}
-
-		public static Vector2 ClampV2ToScreen(Vector2 vec, uint xMargin, uint yMargin)
-		{
-			vec.x = Mathf.Clamp(vec.x, xMargin, Screen.width - xMargin);
-			vec.y = Mathf.Clamp(vec.y, yMargin, Screen.height - yMargin);
-
-			return vec;
-		}
-
-		public static Vector2 ClampV2ToScreen(Vector2 vec, uint Margin)
-		{
-			return ClampV2ToScreen(vec, Margin, Margin);
-		}
-
-		public static Vector2 ClampV2ToScreen(Vector2 vec)
-		{
-			return ClampV2ToScreen(vec, 15);
-		}
-		// UNDONE: This seems messy.  Can we clean it up?
-		public static Rect DockToWindow(Rect icon, Rect window)
-		{
-			// We can't set the x and y of the center point directly, so build a new vector.
-			Vector2 center = new Vector2();
-
-			// If we are near the top or bottom of the screen...
-			if (window.yMax > Screen.height - icon.height ||
-			    window.yMin < icon.height)
-			{
-				// If we are in a corner...
-				if (window.xMax > Screen.width - icon.width ||
-				    window.xMin < icon.width)
-				{
-					// If it is a top corner, put the icon below the window.
-					if (window.yMax < Screen.height / 2)
-					{
-						center.y = window.yMax + icon.height / 2;
-					}
-					// If it is a bottom corner, put the icon above the window.
-					else
-					{
-						center.y = window.yMin - icon.height / 2;
-					}
-				}
-				// If we are not in a corner...
-				else
-				{
-					// If we are along the top edge, align the icon's top edge with the top edge of the window
-					if (window.yMax > Screen.height / 2)
-					{
-						center.y = window.yMax - icon.height / 2;
-					}
-					// If we are along the bottom edge, align the icon's bottom edge with the bottom edge of the window
-					else
-					{
-						center.y = window.yMin + icon.height / 2;
-					}
-				}
-
-				// At the top or bottom, if we are towards the right, put the icon to the right of the window
-				if (window.center.x < Screen.width / 2)
-				{
-					center.x = window.xMin - icon.width / 2;
-				}
-				// At the top or bottom, if we are towards the left, put the icon to the left of the window
-				else
-				{
-					center.x = window.xMax + icon.width / 2;
-				}
-
-			}
-			// If we are not along the top or bottom of the screen...
-			else
-			{
-				// By default, center the icon above the window
-				center.y = window.yMin - icon.height / 2;
-				center.x = window.center.x;
-
-				// If we are along a side...
-				if (window.xMax > Screen.width - icon.width ||
-				    window.xMin < icon.width)
-				{
-					// UNDONE: I'm not sure I like the feel of this part.
-					// If we are along a side towards the bottom, put the icon below the window
-					if (window.center.y > Screen.height / 2)
-					{
-						center.y = window.yMax + icon.height / 2;
-					}
-
-					// Along the left side, align the left edge of the icon with the left edge of the window.
-					if (window.xMax > Screen.width - icon.width)
-					{
-						center.x = window.xMax - icon.width / 2;
-					}
-					// Along the right side, align the right edge of the icon with the right edge of the window.
-					else if (window.xMin < icon.width)
-					{
-						center.x = window.xMin + icon.width / 2;
-					}
-				}
-			}
-
-			// Assign the vector to the center of the rect.
-			icon.center = center;
-
-			// Return the icon's position.
-			return icon;
-		}
-
-		public static ExperimentSituations GetExperimentSituation(this Vessel vessel)
-		{
-			Vessel.Situations situation = vessel.situation;
-
-			switch (situation)
-			{
-				case Vessel.Situations.PRELAUNCH:
-				case Vessel.Situations.LANDED:
-					return ExperimentSituations.SrfLanded;
-				case Vessel.Situations.SPLASHED:
-					return ExperimentSituations.SrfSplashed;
-				case Vessel.Situations.FLYING:
-					if (vessel.altitude < (double)vessel.mainBody.scienceValues.flyingAltitudeThreshold)
-					{
-						return ExperimentSituations.FlyingLow;
-					}
-					else
-					{
-						return ExperimentSituations.FlyingHigh;
-					}
-			}
-
-			if (vessel.altitude < (double)vessel.mainBody.scienceValues.spaceAltitudeThreshold)
-			{
-				return ExperimentSituations.InSpaceLow;
-			}
-			else
-			{
-				return ExperimentSituations.InSpaceHigh;
-			}
-		}
-
-		public static string HumanString(this ExperimentSituations situation)
-		{
-			switch (situation)
-			{
-				case ExperimentSituations.FlyingHigh:
-					return "Upper Atmosphere";
-				case ExperimentSituations.FlyingLow:
-					return "Flying";
-				case ExperimentSituations.SrfLanded:
-					return "Surface";
-				case ExperimentSituations.InSpaceLow:
-					return "Near in Space";
-				case ExperimentSituations.InSpaceHigh:
-					return "High in Space";
-				case ExperimentSituations.SrfSplashed:
-					return "Splashed Down";
-				default:
-					return "Unknown";
-			}
-		}
-
-		private static ScreenMessage debugmsg = new ScreenMessage("", 2f, ScreenMessageStyle.UPPER_RIGHT);
-
-		[System.Diagnostics.Conditional("DEBUG")]
-		public static void PostDebugMessage(string Msg)
-		{
-			if (HighLogic.LoadedScene > GameScenes.SPACECENTER)
-			{
-				debugmsg.message = Msg;
-				ScreenMessages.PostScreenMessage(debugmsg, true);
-			}
-
-			KSPLog.print(Msg);
-		}
-	}
-}

file:b/VOID.csproj (new)
--- /dev/null
+++ b/VOID.csproj
@@ -1,1 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_win</Configuration>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{45ACC1CC-942C-4A66-BFC7-8BE375938B18}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <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>
+    <SynchReleaseVersion>false</SynchReleaseVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_win|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG; TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="xcopy /Y ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_win|AnyCPU' ">
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <DefineConstants>TRACE</DefineConstants>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="xcopy /Y ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_linux|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG; TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_linux|AnyCPU' ">
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Compile Include="IVOID_Module.cs" />
+    <Compile Include="VOIDFlightMaster.cs" />
+    <Compile Include="VOID_Core.cs" />
+    <Compile Include="VOID_Module.cs" />
+    <Compile Include="VOID_HUD.cs" />
+    <Compile Include="VOID_SaveValue.cs" />
+    <Compile Include="VOID_Orbital.cs" />
+    <Compile Include="VOID_SurfAtmo.cs" />
+    <Compile Include="VOID_VesselInfo.cs" />
+    <Compile Include="VOID_Transfer.cs" />
+    <Compile Include="VOID_CBInfoBrowser.cs" />
+    <Compile Include="VOID_Rendezvous.cs" />
+    <Compile Include="VOID_VesselRegister.cs" />
+    <Compile Include="VOID_DataLogger.cs" />
+    <Compile Include="VOID_EditorCore.cs" />
+    <Compile Include="VOID_EditorHUD.cs" />
+    <Compile Include="VOID_DataValue.cs" />
+    <Compile Include="VOIDEditorMaster.cs" />
+    <Compile Include="VOID_Tools.cs" />
+    <Compile Include="VOID_Localization.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VOID_HUDAdvanced.cs" />
+    <Compile Include="VOID_TWR.cs" />
+    <Compile Include="VOID_CareerStatus.cs" />
+    <Compile Include="VOID_StageInfo.cs" />
+    <Compile Include="VOID_Styles.cs" />
+    <Compile Include="VOID_Data.cs" />
+    <Compile Include="VOID_HUDModule.cs" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Policies>
+          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
+        </Policies>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <Reference Include="System">
+      <HintPath>..\_KSPAssemblies\System.dll</HintPath>
+    </Reference>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\_KSPAssemblies\Assembly-CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>..\_KSPAssemblies\UnityEngine.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ToadicusTools\ToadicusTools.csproj">
+      <Project>{D48A5542-6655-4149-BC27-B27DF0466F1C}</Project>
+      <Name>ToadicusTools</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\VesselSimulator\VesselSimulator.csproj">
+      <Project>{30FD6C0B-D36E-462F-B0FF-F0FAC9C666CF}</Project>
+      <Name>VesselSimulator</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
 

--- /dev/null
+++ b/VOIDEditorMaster.cs
@@ -1,1 +1,130 @@
+// VOID
+//
+// VOIDEditorMaster.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.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Much, much credit to Younata, Adammada, Nivvydaskrl and to all the authors
+//  behind MechJeb, RemoteTech Relay Network, ISA MapSat, and Protractor for some
+//  invaluable functions and making your nicely written code available to learn from.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  This software uses VesselSimulator and Engineer.Extensions from Engineer Redux.
+//  Engineer Redux (c) 2013 cybutek
+//  Used by permission.
+//
+///////////////////////////////////////////////////////////////////////////////
 
+using KerbalEngineer.VesselSimulator;
+using KSP;
+using System;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	[KSPAddon(KSPAddon.Startup.EditorAny, false)]
+	public class VOIDEditorMaster : MonoBehaviour
+	{
+		protected VOID_EditorCore Core;
+
+		public void Awake()
+		{
+			Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
+			this.Core = VOID_EditorCore.Instance;
+			this.Core.ResetGUI ();
+			Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
+		}
+
+		public void Update()
+		{
+			if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
+			{
+				this.Core.SaveConfig ();
+				this.Core = null;
+				VOID_EditorCore.Reset();
+				return;
+			}
+
+			if (this.Core == null)
+			{
+				this.Awake();
+			}
+
+			this.Core.Update ();
+
+			if (this.Core.factoryReset)
+			{
+				KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
+				this.Core = null;
+				VOID_EditorCore.Reset();
+			}
+		}
+
+		public void FixedUpdate()
+		{
+			if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
+			{
+				return;
+			}
+
+			this.Core.FixedUpdate ();
+		}
+
+		public void OnGUI()
+		{
+			if (this.Core == null)
+			{
+				return;
+			}
+
+			this.Core.OnGUI();
+		}
+
+		public void OnDestroy()
+		{
+			if (this.Core == null)
+			{
+				return;
+			}
+
+			this.Core.OnDestroy();
+		}
+
+		public void OnApplicationQuit()
+		{
+			if (this.Core == null)
+			{
+				return;
+			}
+
+			this.Core.OnApplicationQuit();
+		}
+	}
+}
+

--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -1,21 +1,30 @@
-///////////////////////////////////////////////////////////////////////////////
+// VOID
 //
-//    VOID - Vessel Orbital Information Display for Kerbal Space Program
-//    Copyright (C) 2012 Iannic-ann-od
-//    Copyright (C) 2013 Toadicus
+// VOIDFlightMaster.cs
 //
-//    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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.
 //
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -33,7 +42,8 @@
 
 using System;
 using UnityEngine;
-using Engineer.VesselSimulator;
+using KerbalEngineer.VesselSimulator;
+using ToadicusTools;
 
 namespace VOID
 {
@@ -47,7 +57,6 @@
 			Tools.PostDebugMessage ("VOIDFlightMaster: Waking up.");
 			this.Core = (VOID_Core)VOID_Core.Instance;
 			this.Core.ResetGUI ();
-			SimManager.HardReset();
 			Tools.PostDebugMessage ("VOIDFlightMaster: Awake.");
 		}
 
@@ -95,66 +104,26 @@
 
 			this.Core.OnGUI();
 		}
-    }
 
-	[KSPAddon(KSPAddon.Startup.EditorAny, false)]
-	public class VOIDEditorMaster : MonoBehaviour
-	{
-		protected VOID_EditorCore Core;
-
-		public void Awake()
-		{
-			Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
-			this.Core = VOID_EditorCore.Instance;
-			this.Core.ResetGUI ();
-			SimManager.HardReset();
-			Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
-		}
-
-		public void Update()
-		{
-			if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
-			{
-				this.Core.SaveConfig ();
-				this.Core = null;
-				VOID_EditorCore.Reset();
-				return;
-			}
-
-			if (this.Core == null)
-			{
-				this.Awake();
-			}
-
-			this.Core.Update ();
-
-			if (this.Core.factoryReset)
-			{
-				KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
-				this.Core = null;
-				VOID_EditorCore.Reset();
-			}
-		}
-
-		public void FixedUpdate()
-		{
-			if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
-			{
-				return;
-			}
-
-			this.Core.FixedUpdate ();
-		}
-
-		public void OnGUI()
+		public void OnDestroy()
 		{
 			if (this.Core == null)
 			{
 				return;
 			}
 
-			this.Core.OnGUI();
+			this.Core.OnDestroy();
 		}
-	}
+
+		public void OnApplicationQuit()
+		{
+			if (this.Core == null)
+			{
+				return;
+			}
+
+			this.Core.OnApplicationQuit();
+		}
+    }
 }
 

--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -1,26 +1,35 @@
-//
-//  VOID_Orbital.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// VOID
+//
+// VOID_CBInfoBrowser.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.Collections.Generic;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -42,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";
@@ -63,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, VOID_Styles.labelCenterBold, 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();
@@ -86,20 +98,18 @@
 			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, VOID_Styles.labelCenterBold, 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();
 
 			GUILayout.EndHorizontal();
-
-			//}
 
 			//toggle for orbital info chunk
 			if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital.value = !toggleOrbital;
@@ -201,132 +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)
 		{
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.FormatInterval(body.orbit.timeToAp), VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.FormatInterval(body.orbit.timeToPe), VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.FormatInterval(body.orbit.period), VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.FormatInterval(body.rotationPeriod), VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Styles.labelRight, 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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", VOID_Styles.labelRight, 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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(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", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Styles.labelRight, 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, VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
 		    }
-		    //GUILayout.EndHorizontal();
 		}
 
 		private void body_OP_show_physical_info(CelestialBody body)
 		{
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(((Math.Pow((body.Radius), 2) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+			GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+			GUILayout.Label((((body.Radius * body.Radius) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
 			// divide by 1000 to convert m to km
-			GUILayout.Label((((4d / 3) * Math.PI * Math.Pow(body.Radius, 3)) / 1000).ToString("0.00e+00") + "km³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.Label(((4 / 3) * Math.PI * Math.Pow((vessel.mainBody.Radius / 1000), 3)).ToString(), right, GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			double p = body.Mass / (Math.Pow(body.Radius, 3) * (4d / 3) * Math.PI);
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(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.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
+			GUILayout.Label((((4d / 3) * Math.PI * (body.Radius * body.Radius * body.Radius)) / 1000).ToString("0.00e+00") + "km³", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+			double p = body.Mass / ((body.Radius * body.Radius * body.Radius) * (4d / 3) * Math.PI);
+
+			GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+			if (body.bodyName == "Sun") GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+			else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
 
 			//show # artificial satellites
 			int num_art_sats = 0;
@@ -335,30 +366,87 @@
 				if (v.mainBody == body && v.situation.ToString() == "ORBITING") num_art_sats++;
 			}
 
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			double g_ASL = (VOID_Core.Constant_G * body.Mass) / Math.Pow(body.Radius, 2);
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			string O2 = "No";
-			if (body.atmosphereContainsOxygen == true) O2 = "Yes";
-			GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(num_art_sats.ToString(), VOID_Styles.labelRight, 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_Styles.labelRight, GUILayout.ExpandWidth(true));
+
+			if (body.atmosphere)
+			{
+				GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m",
+					VOID_Styles.labelRight,
+					GUILayout.ExpandWidth(true));
+
+				string O2 = "No";
+				if (body.atmosphereContainsOxygen == true) O2 = "Yes";
+				GUILayout.Label(O2, VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+			}
+			else
+			{
+				GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+				GUILayout.Label("N/A", VOID_Styles.labelRight, GUILayout.ExpandWidth(true));
+			}
+
 			string ocean = "No";
 			if (body.ocean == true) ocean = "Yes";
-			GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
+			GUILayout.Label(ocean, VOID_Styles.labelRight, 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#"),
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.ocean ? scienceValues.SplashedDataValue.ToString("0.0#") : "N/A",
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.atmosphere ? scienceValues.FlyingLowDataValue.ToString("0.0#") : "N/A",
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.atmosphere ? scienceValues.FlyingHighDataValue.ToString("0.0#") : "N/A",
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(scienceValues.InSpaceLowDataValue.ToString("0.0#"),
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(scienceValues.InSpaceHighDataValue.ToString("0.0#"),
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				body.atmosphere ? scienceValues.flyingAltitudeThreshold.ToString("N0") : "N/A",
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(
+				scienceValues.spaceAltitudeThreshold.ToString("N0"),
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
+
+			GUILayout.Label(scienceValues.RecoveryValue.ToString("0.0#"),
+				VOID_Styles.labelRight,
+				GUILayout.ExpandWidth(true));
 		}
 	}
 }

--- /dev/null
+++ b/VOID_CareerStatus.cs
@@ -1,1 +1,241 @@
-
+// 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;
+		}
+	}
+}
+
+

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -1,34 +1,45 @@
+// VOID
 //
-//  VOID_Core.cs
+// VOID_Core.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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 KerbalEngineer.VesselSimulator;
+using KSP;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using KSP;
+using System.Text;
+using ToadicusTools;
 using UnityEngine;
-using Engineer.VesselSimulator;
 
 namespace VOID
 {
 	public class VOID_Core : VOID_Module, IVOID_Module
 	{
+		#region Singleton Members
 		/*
 		 * Static Members
 		 * */
@@ -60,67 +71,92 @@
 		public static void Reset()
 		{
 			_instance.StopGUI();
+			_instance.Dispose();
 			_instance = null;
 			_initialized = false;
 		}
-
-		public static double Constant_G = 6.674e-11;
+		#endregion
+
+		public static readonly double Constant_G = 6.674e-11;
+
 		/*
 		 * Fields
 		 * */
 		protected string VoidName = "VOID";
-		protected string VoidVersion = "0.9.19";
+		protected string VoidVersion;
+
 		protected bool _factoryReset = false;
+
 		[AVOID_SaveValue("configValue")]
 		protected VOID_SaveValue<int> configVersion = 1;
+
 		protected List<IVOID_Module> _modules = new List<IVOID_Module>();
 		protected bool _modulesLoaded = false;
+
 		[AVOID_SaveValue("mainWindowPos")]
 		protected VOID_SaveValue<Rect> mainWindowPos = new Rect(475, 575, 10f, 10f);
 		[AVOID_SaveValue("mainGuiMinimized")]
 		protected VOID_SaveValue<bool> mainGuiMinimized = false;
+
 		[AVOID_SaveValue("configWindowPos")]
 		protected VOID_SaveValue<Rect> configWindowPos = new Rect(825, 625, 10f, 10f);
 		[AVOID_SaveValue("configWindowMinimized")]
+
 		protected VOID_SaveValue<bool> configWindowMinimized = true;
 		[AVOID_SaveValue("VOIDIconPos")]
 		protected VOID_SaveValue<Rect> VOIDIconPos = new Rect(Screen.width / 2 - 200, Screen.height - 32, 32f, 32f);
-		protected Texture2D VOIDIconOff;
-		protected Texture2D VOIDIconOn;
+
 		protected Texture2D VOIDIconTexture;
-		protected string VOIDIconOnPath = "VOID/Textures/void_icon_on";
-		protected string VOIDIconOffPath = "VOID/Textures/void_icon_off";
+		protected string VOIDIconOnActivePath;
+		protected string VOIDIconOnInactivePath;
+		protected string VOIDIconOffActivePath;
+		protected string VOIDIconOffInactivePath;
+
 		protected bool VOIDIconLocked = true;
+
 		protected GUIStyle iconStyle;
+
 		protected int windowBaseID = -96518722;
 		protected int _windowID = 0;
+
 		protected bool GUIStylesLoaded = false;
-		protected Dictionary<string, GUIStyle> _LabelStyles = new Dictionary<string, GUIStyle>();
+
+		protected CelestialBody _homeBody;
+
 		[AVOID_SaveValue("togglePower")]
 		public VOID_SaveValue<bool> togglePower = true;
 		public bool powerAvailable = true;
+
 		[AVOID_SaveValue("consumeResource")]
 		protected VOID_SaveValue<bool> consumeResource = false;
+
 		[AVOID_SaveValue("resourceName")]
 		protected VOID_SaveValue<string> resourceName = "ElectricCharge";
+
 		[AVOID_SaveValue("resourceRate")]
 		protected VOID_SaveValue<float> resourceRate = 0.2f;
+
 		[AVOID_SaveValue("updatePeriod")]
 		protected VOID_SaveValue<double> _updatePeriod = 1001f / 15000f;
 		protected float _updateTimer = 0f;
 		protected string stringFrequency;
-		// Celestial Body Housekeeping
-		protected List<CelestialBody> _allBodies = new List<CelestialBody>();
-		protected bool bodiesLoaded = false;
+
+		[AVOID_SaveValue("vesselSimActive")]
+		protected VOID_SaveValue<bool> vesselSimActive;
+
 		// Vessel Type Housekeeping
 		protected List<VesselType> _allVesselTypes = new List<VesselType>();
 		protected bool vesselTypesLoaded = false;
 		public float saveTimer = 0;
+
 		protected string defaultSkin = "KSP window 2";
+
 		[AVOID_SaveValue("defaultSkin")]
 		protected VOID_SaveValue<string> _skinName;
-		protected Dictionary<string, GUISkin> skin_list;
-		protected List<string> skinNames;
+		protected int _skinIdx;
+
+		protected Dictionary<string, GUISkin> validSkins;
+		protected string[] skinNames;
 		protected string[] forbiddenSkins =
 			{
 				"PlaqueDialogSkin",
@@ -130,14 +166,25 @@
 				"ExpRecoveryDialogSkin",
 				"KSP window 5",
 				"KSP window 6",
-				"PartTooltipSkin"
+				"PartTooltipSkin",
+				"KSCContextMenuSkin"
 			};
 		protected bool skinsLoaded = false;
+
 		public bool configDirty;
+
 		[AVOID_SaveValue("UseBlizzyToolbar")]
 		protected VOID_SaveValue<bool> _UseToolbarManager;
-		protected bool ToolbarManagerLoaded;
-		internal ToolbarButtonWrapper ToolbarButton;
+		internal IButton ToolbarButton;
+
+		internal ApplicationLauncherButton AppLauncherButton;
+
+		/*
+		 * Events
+		 * */
+		public delegate void VOIDEventHandler(object sender);
+		public event VOIDEventHandler onApplicationQuit;
+
 		/*
 		 * Properties
 		 * */
@@ -161,11 +208,18 @@
 		{
 			get
 			{
-				if (!this.skinsLoaded || this._skinName == null)
-				{
-					return AssetBase.GetGUISkin(this.defaultSkin);
-				}
-				return this.skin_list[this._skinName];
+				if (this.skinsLoaded)
+				{
+					try
+					{
+						return this.validSkins[this._skinName];
+					}
+					catch
+					{
+					}
+				}
+
+				return AssetBase.GetGUISkin(this.defaultSkin);
 			}
 		}
 
@@ -181,19 +235,33 @@
 			}
 		}
 
-		public Dictionary<string, GUIStyle> LabelStyles
-		{
-			get
-			{
-				return this._LabelStyles;
-			}
-		}
-
 		public List<CelestialBody> allBodies
 		{
 			get
 			{
-				return this._allBodies;
+				return FlightGlobals.Bodies;
+			}
+		}
+
+		public List<CelestialBody> sortedBodyList
+		{
+			get;
+			private set;
+		}
+
+		public CelestialBody HomeBody
+		{
+			get
+			{
+				if (this._homeBody == null)
+				{
+					if (Planetarium.fetch != null)
+					{
+						this._homeBody = Planetarium.fetch.Home;
+					}
+				}
+
+				return this._homeBody;
 			}
 		}
 
@@ -221,445 +289,165 @@
 			}
 		}
 
+		public Stage[] Stages
+		{
+			get;
+			protected set;
+		}
+
+		public Stage LastStage
+		{
+			get;
+			protected set;
+		}
+
+		protected IconState powerState
+		{
+			get
+			{
+				if (this.togglePower && this.powerAvailable)
+				{
+					return IconState.PowerOn;
+				}
+				else
+				{
+					return IconState.PowerOff;
+				}
+
+			}
+		}
+
+		protected IconState activeState
+		{
+			get
+			{
+				if (this.mainGuiMinimized)
+				{
+					return IconState.Inactive;
+				}
+				else
+				{
+					return IconState.Active;
+				}
+
+			}
+		}
+
 		protected bool UseToolbarManager
 		{
 			get
 			{
-				return _UseToolbarManager;
+				return _UseToolbarManager & ToolbarManager.ToolbarAvailable;
 			}
 			set
 			{
-				if (value == false && this.ToolbarManagerLoaded && this.ToolbarButton != null)
+				if (this._UseToolbarManager == value)
+				{
+					return;
+				}
+
+				if (value == false && this.ToolbarButton != null)
 				{
 					this.ToolbarButton.Destroy();
 					this.ToolbarButton = null;
 				}
-				if (value == true && this.ToolbarManagerLoaded && this.ToolbarButton == null)
-				{
+				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;
+			}
+		}
+
 		/*
 		 * Methods
 		 * */
-		protected VOID_Core()
-		{
-			this._Name = "VOID Core";
-
-			this._Active.value = true;
-
-			this.VOIDIconOn = GameDatabase.Instance.GetTexture(this.VOIDIconOnPath, false);
-			this.VOIDIconOff = GameDatabase.Instance.GetTexture(this.VOIDIconOffPath, false);
-
-			this._skinName = this.defaultSkin;
-
-			this.UseToolbarManager = false;
-			this.ToolbarManagerLoaded = false;
-
-			this.LoadConfig();
-		}
-
-		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);
-			}
-
-			this._modulesLoaded = true;
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Loaded {1} modules.",
-				this.GetType().Name,
-				this.Modules.Count
-			));
-		}
-
-		protected void LoadModule(Type T)
-		{
-			var existingModules = this._modules.Where(mod => mod.GetType().Name == T.Name);
-			if (existingModules.Any())
-			{
-				Tools.PostDebugMessage(string.Format(
-					"{0}: refusing to load {1}: already loaded",
-					this.GetType().Name,
-					T.Name
-				));
-				return;
-			}
-			IVOID_Module module = Activator.CreateInstance(T) as IVOID_Module;
-			module.LoadConfig();
-			this._modules.Add(module);
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: loaded module {1}.",
-				this.GetType().Name,
-				T.Name
-			));
-		}
-
-		protected void LoadSkins()
-		{
-			Tools.PostDebugMessage("AssetBase has skins: \n" +
-			string.Join("\n\t",
-				Resources.FindObjectsOfTypeAll(typeof(GUISkin))
-			            .Select(s => s.ToString())
-			            .ToArray()
-			)
-			);
-
-			this.skin_list = Resources.FindObjectsOfTypeAll(typeof(GUISkin))
-				.Where(s => !this.forbiddenSkins.Contains(s.name))
-					.Select(s => s as GUISkin)
-					.GroupBy(s => s.name)
-					.Select(g => g.First())
-					.ToDictionary(s => s.name);
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: loaded {1} GUISkins.",
-				this.GetType().Name,
-				this.skin_list.Count
-			));
-
-			this.skinNames = this.skin_list.Keys.ToList();
-			this.skinNames.Sort();
-
-			if (this._skinName == null || !this.skinNames.Contains(this._skinName))
-			{
-				this._skinName = this.defaultSkin;
-				Tools.PostDebugMessage(string.Format(
-					"{0}: resetting _skinIdx to default.",
-					this.GetType().Name
-				));
-			}
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: _skinIdx = {1}.",
-				this.GetType().Name,
-				this._skinName.ToString()
-			));
-
-			this.skinsLoaded = true;
-		}
-
-		protected void LoadGUIStyles()
-		{
-			this.LabelStyles["link"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["link"].fontStyle = FontStyle.Bold;
-
-			this.LabelStyles["center"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["center"].normal.textColor = Color.white;
-			this.LabelStyles["center"].alignment = TextAnchor.UpperCenter;
-
-			this.LabelStyles["center_bold"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["center_bold"].normal.textColor = Color.white;
-			this.LabelStyles["center_bold"].alignment = TextAnchor.UpperCenter;
-			this.LabelStyles["center_bold"].fontStyle = FontStyle.Bold;
-
-			this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["right"].normal.textColor = Color.white;
-			this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
-
-			this.LabelStyles["red"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["red"].normal.textColor = Color.red;
-			this.LabelStyles["red"].alignment = TextAnchor.MiddleCenter;
-
-			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;
-		}
-
-		protected void LoadAllBodies()
-		{
-			this._allBodies = FlightGlobals.Bodies;
-			this.bodiesLoaded = true;
-		}
-
-		protected void LoadVesselTypes()
-		{
-			this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
-			this.vesselTypesLoaded = true;
-		}
-
-		protected void LoadBeforeUpdate()
-		{
-			if (!this.bodiesLoaded)
-			{
-				this.LoadAllBodies();
-			}
-
-			if (!this.vesselTypesLoaded)
-			{
-				this.LoadVesselTypes();
-			}
-		}
-
-		protected void LoadToolbarManager()
-		{
-			this.ToolbarManagerLoaded = ToolbarButtonWrapper.ToolbarManagerPresent;
-
-			if (this.ToolbarManagerLoaded)
-			{
+		public override void DrawGUI()
+		{
+			this._windowID = this.windowBaseID;
+
+			if (!this._modulesLoaded)
+			{
+				this.LoadModulesOfType<IVOID_Module>();
+			}
+
+			if (!this.skinsLoaded)
+			{
+				this.LoadSkins();
+			}
+
+			GUI.skin = this.Skin;
+
+			if (!this.GUIStylesLoaded)
+			{
+				this.LoadGUIStyles();
+
+				Tools.PostDebugMessage(
+					this,
+					"ToolbarAvailable: {0}, UseToobarManager: {1}",
+					ToolbarManager.ToolbarAvailable,
+					this.UseToolbarManager);
+			}
+
+			if (!this.UseToolbarManager)
+			{
+				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();
 			}
-		}
-
-		protected void InitializeToolbarButton()
-		{
-			this.ToolbarButton = ToolbarButtonWrapper.TryWrapToolbarButton(this.GetType().Name, "coreToggle");
-			this.ToolbarButton.Text = this.VoidName;
-			this.ToolbarButton.TexturePath = this.VOIDIconOffPath;
-			if (this is VOID_EditorCore)
-			{
-				this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.EDITOR });
-			}
-			else
-			{
-				this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.FLIGHT });
-			}
-			this.ToolbarButton.AddButtonClickHandler(
-				(e) => this.mainGuiMinimized = !this.mainGuiMinimized
-			);
-		}
-
-		public void VOIDMainWindow(int _)
-		{
-			GUILayout.BeginVertical();
-			
-			if (this.powerAvailable || HighLogic.LoadedSceneIsEditor)
-			{
-				if (!HighLogic.LoadedSceneIsEditor)
-				{
-					string str = "ON";
-					if (togglePower)
-						str = "OFF";
-					if (GUILayout.Button("Power " + str))
-						togglePower.value = !togglePower;
-				}
-
-				if (togglePower || HighLogic.LoadedSceneIsEditor)
-				{
-					foreach (IVOID_Module module in this.Modules)
-					{
-						module.toggleActive = GUILayout.Toggle(module.toggleActive, module.Name);
-					}
-				}
-			}
-			else
-			{
-				GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
-			}
-
-			this.configWindowMinimized.value = !GUILayout.Toggle(!this.configWindowMinimized, "Configuration");
-
-			GUILayout.EndVertical();
-			GUI.DragWindow();
-		}
-
-		public void VOIDConfigWindow(int _)
-		{
-			GUILayout.BeginVertical();
-
-			this.DrawConfigurables();
-
-			GUILayout.EndVertical();
-			GUI.DragWindow();
-		}
-
-		public override void DrawConfigurables()
-		{
-			int skinIdx;
-
-			GUIContent _content;
-
-			if (HighLogic.LoadedSceneIsFlight)
-			{
-				this.consumeResource.value = GUILayout.Toggle(this.consumeResource, "Consume Resources");
-
-				this.VOIDIconLocked = GUILayout.Toggle(this.VOIDIconLocked, "Lock Icon Position");
-			}
-
-			this.UseToolbarManager = GUILayout.Toggle(this.UseToolbarManager, "Use Blizzy's Toolbar If Available");
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-
-			GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
-
-			_content = new GUIContent();
-
-			if (skinNames.Contains(this._skinName))
-			{
-				skinIdx = skinNames.IndexOf(this._skinName);
-			}
-			else if (skinNames.Contains(this.defaultSkin))
-			{
-				skinIdx = skinNames.IndexOf(this.defaultSkin);
-			}
-			else
-			{
-				skinIdx = 0;
-			}
-
-			_content.text = "◄";
-			_content.tooltip = "Select previous skin";
-			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
-			{
-				this.GUIStylesLoaded = false;
-				skinIdx--;
-				if (skinIdx < 0)
-					skinIdx = skinNames.Count - 1;
-				Tools.PostDebugMessage(string.Format(
-					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
-					this.GetType().Name,
-					this._skinName,
-					this.skin_list.Count
-				));
-			}
-
-			_content.text = this.Skin.name;
-			_content.tooltip = "Current skin";
-			GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
-
-			_content.text = "►";
-			_content.tooltip = "Select next skin";
-			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
-			{
-				this.GUIStylesLoaded = false;
-				skinIdx++;
-				if (skinIdx >= skinNames.Count)
-					skinIdx = 0;
-				Tools.PostDebugMessage(string.Format(
-					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
-					this.GetType().Name,
-					this._skinName,
-					this.skin_list.Count
-				));
-			}
-
-			if (this._skinName != skinNames[skinIdx])
-			{
-				this._skinName = skinNames[skinIdx];
-			}
-
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal();
-			GUILayout.Label("Update Rate (Hz):");
-			if (this.stringFrequency == null)
-			{
-				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;
-				double.TryParse(stringFrequency, out updateFreq);
-				this._updatePeriod = 1 / updateFreq;
-			}
-			GUILayout.EndHorizontal();
-
-			foreach (IVOID_Module mod in this.Modules)
-			{
-				mod.DrawConfigurables();
-			}
-
-			this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
-		}
-
-		public override void DrawGUI()
-		{
-			this._windowID = this.windowBaseID;
-
-			if (!this._modulesLoaded)
-			{
-				this.LoadModulesOfType<IVOID_Module>();
-			}
-
-			if (this.UseToolbarManager && !this.ToolbarManagerLoaded)
-			{
-				this.LoadToolbarManager();
-			}
-
-			if (!this.skinsLoaded)
-			{
-				this.LoadSkins();
-			}
-
-			GUI.skin = this.Skin;
-
-			if (!this.GUIStylesLoaded)
-			{
-				this.LoadGUIStyles();
-			}
-
-			if (this.UseToolbarManager && this.ToolbarManagerLoaded)
-			{
-				this.ToolbarButton.TexturePath = VOIDIconOffPath;
-				if (this.togglePower)
-				{
-					this.ToolbarButton.TexturePath = VOIDIconOnPath;
-				}
-			}
-			else
-			{
-				this.VOIDIconTexture = this.VOIDIconOff;  //icon off default
-				if (this.togglePower)
-					this.VOIDIconTexture = this.VOIDIconOn;     //or on if power_toggle==true
-
-				if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
-				{
-					this.mainGuiMinimized.value = !this.mainGuiMinimized;
-				}
-			}
 
 			if (!this.mainGuiMinimized)
 			{
+
 				Rect _mainWindowPos = this.mainWindowPos;
 
 				_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)
 				);
 
-				_mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					_mainWindowPos = Tools.ClampRectToEditorPad(_mainWindowPos);
+				}
+				else
+				{
+					_mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
+				}
 
 				if (_mainWindowPos != this.mainWindowPos)
 				{
@@ -674,13 +462,20 @@
 				_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)
 				);
 
-				_configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					_configWindowPos = Tools.ClampRectToEditorPad(_configWindowPos);
+				}
+				else
+				{
+					_configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
+				}
 
 				if (_configWindowPos != this.configWindowPos)
 				{
@@ -689,7 +484,7 @@
 			}
 		}
 
-		public void OnGUI()
+		public virtual void OnGUI()
 		{
 			if (Event.current.type == EventType.Repaint)
 			{
@@ -743,15 +538,14 @@
 			}
 		}
 
-		public void Update()
+		public virtual void Update()
 		{
 			this.LoadBeforeUpdate();
 
-			if (this.vessel != null)
-			{
-				SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-				Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
-				SimManager.Instance.TryStartSimulation();
+			if (this.vessel != null && this.vesselSimActive)
+			{
+				Tools.PostDebugMessage(this, "Updating SimManager.");
+				this.UpdateSimManager();
 			}
 
 			if (!this.guiRunning)
@@ -788,29 +582,58 @@
 			this._updateTimer += Time.deltaTime;
 		}
 
-		public void FixedUpdate()
-		{
-			if (this.consumeResource &&
+		public virtual void FixedUpdate()
+		{
+			bool newPowerState = this.powerAvailable;
+
+			if (this.togglePower && this.consumeResource &&
 			    this.vessel.vesselType != VesselType.EVA &&
 			    TimeWarp.deltaTime != 0)
 			{
-				float powerReceived = this.vessel.rootPart.RequestResource(this.resourceName,
-					                      this.resourceRate * TimeWarp.fixedDeltaTime);
+				float powerReceived = this.vessel.rootPart.RequestResource(
+					this.resourceName,
+					this.resourceRate * TimeWarp.fixedDeltaTime
+				);
+
 				if (powerReceived > 0)
 				{
-					this.powerAvailable = true;
+					newPowerState = true;
 				}
 				else
 				{
-					this.powerAvailable = false;
-				}
-			}
-
-			foreach (IVOID_BehaviorModule module in
-			         this._modules.OfType<IVOID_BehaviorModule>().Where(m => !m.GetType().IsAbstract))
-			{
-				module.FixedUpdate();
-			}
+					newPowerState = false;
+				}
+
+				if (this.powerAvailable != newPowerState)
+				{
+					this.powerAvailable = newPowerState;
+					this.SetIconTexture(this.powerState | this.activeState);
+				}
+			}
+
+			foreach (IVOID_Module module in this.Modules)
+			{
+				if (module is IVOID_BehaviorModule)
+				{
+					((IVOID_BehaviorModule)module).FixedUpdate();
+				}
+			}
+		}
+
+		public void OnDestroy()
+		{
+			foreach (IVOID_Module module in this.Modules)
+			{
+				if (module is IVOID_BehaviorModule)
+				{
+					((IVOID_BehaviorModule)module).OnDestroy();
+				}
+			}
+		}
+
+		public void OnApplicationQuit()
+		{
+			this.onApplicationQuit(this);
 		}
 
 		public void ResetGUI()
@@ -824,6 +647,427 @@
 			}
 
 			this.StartGUI();
+		}
+
+		public void VOIDMainWindow(int _)
+		{
+			GUILayout.BeginVertical();
+
+			if (this.powerAvailable || HighLogic.LoadedSceneIsEditor)
+			{
+				if (!HighLogic.LoadedSceneIsEditor)
+				{
+					string str = string.Intern("ON");
+					if (togglePower)
+						str = string.Intern("OFF");
+					if (GUILayout.Button("Power " + str))
+					{
+						togglePower.value = !togglePower;
+						this.SetIconTexture(this.powerState | this.activeState);
+					}
+				}
+
+				if (togglePower || HighLogic.LoadedSceneIsEditor)
+				{
+					foreach (IVOID_Module module in this.Modules)
+					{
+						module.toggleActive = GUILayout.Toggle(module.toggleActive, module.Name);
+					}
+				}
+			}
+			else
+			{
+				GUILayout.Label("-- POWER LOST --", VOID_Styles.labelRed);
+			}
+
+			this.configWindowMinimized.value = !GUILayout.Toggle(!this.configWindowMinimized, "Configuration");
+
+			GUILayout.EndVertical();
+			GUI.DragWindow();
+		}
+
+		public void VOIDConfigWindow(int _)
+		{
+			GUILayout.BeginVertical();
+
+			this.DrawConfigurables();
+
+			GUILayout.EndVertical();
+			GUI.DragWindow();
+		}
+
+		public override void DrawConfigurables()
+		{
+			GUIContent _content;
+
+			if (HighLogic.LoadedSceneIsFlight)
+			{
+				this.consumeResource.value = GUILayout.Toggle(this.consumeResource, "Consume Resources");
+
+				this.VOIDIconLocked = GUILayout.Toggle(this.VOIDIconLocked, "Lock Icon Position");
+			}
+
+			this.UseToolbarManager = GUILayout.Toggle(this.UseToolbarManager, "Use Blizzy's Toolbar If Available");
+
+			this.vesselSimActive.value = GUILayout.Toggle(this.vesselSimActive.value,
+				"Enable Engineering Calculations");
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+			GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
+
+			_content = new GUIContent();
+
+			_content.text = "◄";
+			_content.tooltip = "Select previous skin";
+			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
+			{
+				this._skinIdx--;
+				Tools.PostDebugMessage(string.Format(
+					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
+					this.GetType().Name,
+					this._skinName,
+					this.validSkins.Count
+				));
+			}
+
+			_content.text = this.Skin.name;
+			_content.tooltip = "Current skin";
+			GUILayout.Label(_content, VOID_Styles.labelCenter, GUILayout.ExpandWidth(true));
+
+			_content.text = "►";
+			_content.tooltip = "Select next skin";
+			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
+			{
+				this._skinIdx++;
+				Tools.PostDebugMessage(string.Format(
+					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
+					this.GetType().Name,
+					this._skinName,
+					this.validSkins.Count
+				));
+			}
+
+			this._skinIdx %= this.skinNames.Length;
+			if (this._skinIdx < 0)
+			{
+				this._skinIdx += this.skinNames.Length;
+			}
+
+			if (this._skinName != skinNames[this._skinIdx])
+			{
+				this._skinName.value = skinNames[this._skinIdx];
+				this.GUIStylesLoaded = false;
+			}
+
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal();
+			GUILayout.Label("Update Rate (Hz):");
+			if (this.stringFrequency == null)
+			{
+				this.stringFrequency = (1f / this.updatePeriod).ToString();
+			}
+			this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
+
+			if (GUILayout.Button("Apply"))
+			{
+				double updateFreq = 1f / this.updatePeriod;
+				double.TryParse(stringFrequency, out updateFreq);
+				this._updatePeriod = 1 / updateFreq;
+			}
+			GUILayout.EndHorizontal();
+
+			foreach (IVOID_Module mod in this.Modules)
+			{
+				mod.DrawConfigurables();
+			}
+
+			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 = new TimeSpan(0, 0, 0, 0, (int)(this.updatePeriod * 1000d));
+
+				SimManager.TryStartSimulation();
+			}
+			#if DEBUG
+			else
+			{
+				Tools.PostDebugMessage(this, "VesselSimulator results not ready.");
+			}
+			#endif
+		}
+
+		protected void LoadModulesOfType<T>()
+		{
+			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;
+
+			sb.AppendFormat("Loaded {0} modules.", this.Modules.Count);
+			sb.AppendLine();
+		}
+
+		protected void LoadModule(Type T)
+		{
+			var existingModules = this._modules.Where(mod => mod.GetType().Name == T.Name);
+			if (existingModules.Any())
+			{
+				Tools.PostDebugMessage(string.Format(
+					"{0}: refusing to load {1}: already loaded",
+					this.GetType().Name,
+					T.Name
+				));
+				return;
+			}
+			IVOID_Module module = Activator.CreateInstance(T) as IVOID_Module;
+			module.LoadConfig();
+			this._modules.Add(module);
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: loaded module {1}.",
+				this.GetType().Name,
+				T.Name
+			));
+		}
+
+		protected void LoadSkins()
+		{
+			Tools.PostDebugMessage("AssetBase has skins: \n" +
+				string.Join("\n\t",
+					Resources.FindObjectsOfTypeAll(typeof(GUISkin))
+					.Select(s => s.ToString())
+					.ToArray()
+				)
+			);
+
+			this.validSkins = Resources.FindObjectsOfTypeAll(typeof(GUISkin))
+				.Where(s => !this.forbiddenSkins.Contains(s.name))
+				.Select(s => s as GUISkin)
+				.GroupBy(s => s.name)
+				.Select(g => g.First())
+				.ToDictionary(s => s.name);
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: loaded {1} GUISkins.",
+				this.GetType().Name,
+				this.validSkins.Count
+			));
+
+			this.skinNames = this.validSkins.Keys.ToArray();
+			Array.Sort(this.skinNames);
+
+			int defaultIdx = int.MinValue;
+
+			for (int i = 0; i < this.skinNames.Length; i++)
+			{
+				if (this.skinNames[i] == this._skinName)
+				{
+					this._skinIdx = i;
+				}
+				if (this.skinNames[i] == this.defaultSkin)
+				{
+					defaultIdx = i;
+				}
+				if (this._skinIdx != int.MinValue && defaultIdx != int.MinValue)
+				{
+					break;
+				}
+			}
+
+			if (this._skinIdx == int.MinValue)
+			{
+				this._skinIdx = defaultIdx;
+			}
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: _skinIdx = {1}.",
+				this.GetType().Name,
+				this._skinName.ToString()
+			));
+
+			this.skinsLoaded = true;
+		}
+
+		protected void LoadGUIStyles()
+		{
+			VOID_Styles.OnSkinChanged();
+
+			this.GUIStylesLoaded = true;
+		}
+
+		protected void LoadVesselTypes()
+		{
+			this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
+			this.vesselTypesLoaded = true;
+		}
+
+		protected void LoadBeforeUpdate()
+		{
+			if (!this.vesselTypesLoaded)
+			{
+				this.LoadVesselTypes();
+			}
+
+			if (this.sortedBodyList == null && 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())));
+			}
+
+		}
+
+		protected void InitializeToolbarButton()
+		{
+			// Do nothing if (the Toolbar is not available.
+			if (!ToolbarManager.ToolbarAvailable)
+			{
+				Tools.PostDebugMessage(this, "Refusing to make a ToolbarButton: ToolbarAvailable = false");
+				return;
+			}
+
+			this.ToolbarButton = ToolbarManager.Instance.add(this.VoidName, "coreToggle");
+			this.ToolbarButton.Text = this.VoidName;
+			this.SetIconTexture(this.powerState | this.activeState);
+
+			this.ToolbarButton.Visibility = new GameScenesVisibility(GameScenes.EDITOR, GameScenes.FLIGHT);
+
+			this.ToolbarButton.OnClick += 
+				(e) =>
+			{
+				this.ToggleMainWindow();
+			};
+
+			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()
+		{
+			this.mainGuiMinimized = !this.mainGuiMinimized;
+			this.SetIconTexture(this.powerState | this.activeState);
+		}
+
+		protected void SetIconTexture(IconState state)
+		{
+			switch (state)
+			{
+				case (IconState.PowerOff | IconState.Inactive):
+					this.SetIconTexture(this.VOIDIconOffInactivePath);
+					break;
+				case (IconState.PowerOff | IconState.Active):
+					this.SetIconTexture(this.VOIDIconOffActivePath);
+					break;
+				case (IconState.PowerOn | IconState.Inactive):
+					this.SetIconTexture(this.VOIDIconOnInactivePath);
+					break;
+				case (IconState.PowerOn | IconState.Active):
+					this.SetIconTexture(this.VOIDIconOnActivePath);
+					break;
+				default:
+					throw new NotImplementedException();
+			}
+		}
+
+		protected void SetIconTexture(string texturePath)
+		{
+			if (this.ToolbarButton != null)
+			{
+				this.ToolbarButton.TexturePath = texturePath;
+			}
+
+			this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath.Replace("icon", "appIcon"), false);
+
+			if (this.AppLauncherButton != null)
+			{
+				this.AppLauncherButton.SetTexture(VOIDIconTexture);
+			}
 		}
 
 		protected void CheckAndSave()
@@ -874,6 +1118,55 @@
 
 			this.configDirty = false;
 		}
+
+		protected VOID_Core()
+		{
+			this._Name = "VOID Core";
+
+			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;
+
+			this.VOIDIconOnInactivePath = "VOID/Textures/void_icon_light_glow";
+			this.VOIDIconOnActivePath = "VOID/Textures/void_icon_dark_glow";
+			this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_light";
+			this.VOIDIconOffActivePath = "VOID/Textures/void_icon_dark";
+
+			this.vesselSimActive = true;
+
+			this.UseToolbarManager = false;
+
+			this.LoadConfig();
+
+			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,
+			PowerOn = 2,
+			Inactive = 4,
+			Active = 8
+		}
 	}
 }
 

file:b/VOID_Data.cs (new)
--- /dev/null
+++ b/VOID_Data.cs
@@ -1,1 +1,1181 @@
-
+// VOID
+//
+// VOID_Data.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 KerbalEngineer.VesselSimulator;
+using KSP;
+using System;
+using System.Collections.Generic;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public static class VOID_Data
+	{
+		private static Dictionary<int, IVOID_DataValue> dataValues = new Dictionary<int, IVOID_DataValue>();
+		public static Dictionary<int, IVOID_DataValue> DataValues
+		{
+			get
+			{
+				return dataValues;
+			}
+		}
+
+		#region Constants
+
+		private static double kerbinGee;
+
+		public static double KerbinGee
+		{
+			get
+			{
+				if (kerbinGee == default(double))
+				{
+					kerbinGee = core.HomeBody.gravParameter / (core.HomeBody.Radius * core.HomeBody.Radius);
+				}
+
+				return kerbinGee;
+			}
+		}
+
+		#endregion
+
+		#region Core Data
+
+		public static VOID_Core core
+		{
+			get
+			{
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					return VOID_EditorCore.Instance;
+				}
+				else
+				{
+					return VOID_Core.Instance;
+				}
+			}
+		}
+
+		#endregion
+
+		#region Atmosphere
+
+		public static readonly VOID_DoubleValue atmDensity =
+			new VOID_DoubleValue(
+				"Atmosphere Density",
+				new Func<double>(() => core.vessel.atmDensity * 1000f),
+				"g/m³"
+			);
+
+		public static readonly VOID_FloatValue atmLimit =
+			new VOID_FloatValue(
+				"Atmosphere Limit",
+				new Func<float>(() => core.vessel.mainBody.maxAtmosphereAltitude),
+				"m"
+			);
+
+		public static readonly VOID_DoubleValue atmPressure =
+			new VOID_DoubleValue(
+				"Pressure",
+				new Func<double>(() => core.vessel.staticPressure),
+				"atm"
+			);
+
+		public static readonly VOID_FloatValue temperature =
+			new VOID_FloatValue(
+				"Temperature",
+				new Func<float>(() => core.vessel.flightIntegrator.getExternalTemperature()),
+				"°C"
+			);
+
+		#endregion
+
+		#region Attitude
+
+		public static readonly VOID_StrValue vesselHeading =
+			new VOID_StrValue(
+				"Heading",
+				delegate()
+				{
+					double heading = core.vessel.getSurfaceHeading();
+					string cardinal = VOID_Tools.get_heading_text(heading);
+
+					return string.Format(
+						"{0}° {1}",
+						heading.ToString("F2"),
+						cardinal
+					);
+				}
+			);
+
+		public static readonly VOID_DoubleValue vesselPitch =
+			new VOID_DoubleValue(
+				"Pitch",
+				() => core.vessel.getSurfacePitch(),
+				"°"
+			);
+
+		#endregion
+
+		#region Career
+
+		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)
+					);
+				}
+			);
+
+		#endregion
+
+		#region Control
+
+		public static readonly VOID_FloatValue mainThrottle =
+			new VOID_FloatValue(
+				"Throttle",
+				new Func<float>(() => core.vessel.ctrlState.mainThrottle * 100f),
+				"%"
+			);
+
+		#endregion
+
+		#region Engineering
+
+		public static readonly VOID_IntValue partCount =
+			new VOID_IntValue(
+				"Parts",
+				new Func<int>(() => core.vessel.Parts.Count),
+				""
+			);
+
+		#region Mass
+
+		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 resourceMass =
+			new VOID_DoubleValue(
+				"Resource Mass",
+				delegate()
+				{
+					if (core.Stages == null || core.LastStage == null)
+					{
+						return double.NaN;
+					}
+
+					return core.LastStage.resourceMass;
+				},
+				"tons"
+			);
+
+		public static readonly VOID_DoubleValue stageResourceMass =
+			new VOID_DoubleValue(
+				"Resource Mass (Stage)",
+				delegate()
+				{
+					if (core.LastStage == null)
+					{
+						return double.NaN;
+					}
+
+					return core.LastStage.resourceMass;
+				},
+				"tons"
+			);
+
+		public static readonly VOID_DoubleValue totalMass =
+			new VOID_DoubleValue(
+				"Total Mass",
+				delegate()
+				{
+					if (core.Stages == null || core.LastStage == null)
+					{
+						return double.NaN;
+					}
+
+					return core.LastStage.totalMass;
+				},
+				"tons"
+			);
+
+		#endregion
+
+		#region DeltaV
+
+		public static readonly VOID_DoubleValue stageDeltaV =
+			new VOID_DoubleValue(
+				"DeltaV (Current Stage)",
+				delegate()
+				{
+					if (core.Stages == null || core.LastStage == null)
+						return double.NaN;
+					return core.LastStage.deltaV;
+				},
+				"m/s"
+			);
+
+		public static readonly VOID_DoubleValue totalDeltaV =
+			new VOID_DoubleValue(
+				"DeltaV (Total)",
+				delegate()
+				{
+					if (core.Stages == null || core.LastStage == null)
+						return double.NaN;
+					return core.LastStage.totalDeltaV;
+				},
+				"m/s"
+			);
+
+		#endregion
+
+		#region Propulsion
+
+		public static readonly VOID_StrValue currmaxThrustWeight =
+			new VOID_StrValue(
+				"T:W (curr/max)",
+				delegate()
+				{
+					if (core.Stages == null || core.LastStage == null)
+						return "N/A";
+
+					return string.Format(
+						"{0} / {1}",
+						(VOID_Data.currThrustWeight.Value).ToString("F2"),
+						(VOID_Data.maxThrustWeight.Value).ToString("F2")
+					);
+				}
+			);
+
+		public static readonly VOID_StrValue currmaxThrust =
+			new VOID_StrValue(
+				"Thrust (curr/max)",
+				delegate()
+				{
+					if (core.Stages == null || core.LastStage == null)
+						return "N/A";
+
+					double currThrust = core.LastStage.actualThrust;
+					double maxThrust = core.LastStage.thrust;
+
+					return string.Format(
+						"{0} / {1}",
+						currThrust.ToString("F1"),
+						maxThrust.ToString("F1")
+					);
+				}
+			);
+
+		public static readonly VOID_DoubleValue stageMassFlow =
+			new VOID_DoubleValue(
+				"Stage Mass Flow",
+				delegate()
+				{
+					if (core.LastStage == null)
+					{
+						return double.NaN;
+					}
+
+					double stageIsp = core.LastStage.isp;
+					double stageThrust = stageNominalThrust;
+
+					Tools.PostDebugMessage(typeof(VOID_Data), "calculating stageMassFlow from:\n" +
+						"\tstageIsp: {0}\n" +
+						"\tstageThrust: {1}\n" +
+						"\tKerbinGee: {2}\n",
+						stageIsp,
+						stageThrust,
+						KerbinGee
+					);
+
+					return stageThrust / (stageIsp * KerbinGee);
+				},
+				"Mg/s"
+			);
+
+		public static readonly VOID_DoubleValue stageNominalThrust =
+			new VOID_DoubleValue(
+				"Nominal Stage Thrust",
+				delegate()
+				{
+					if (core.LastStage == null)
+					{
+						return double.NaN;
+					}
+
+					if (core.LastStage.actualThrust == 0d)
+					{
+						return core.LastStage.thrust;
+					}
+					else
+					{
+						return core.LastStage.actualThrust;
+					}
+				},
+				"kN"
+			);
+
+		#endregion
+
+		#region Kinetics
+
+		public static readonly VOID_DoubleValue currThrustWeight =
+			new VOID_DoubleValue(
+				"T:W Ratio",
+				delegate()
+				{
+					if (core.LastStage == null)
+					{
+						return double.NaN;
+					}
+
+					return core.LastStage.actualThrustToWeight;
+				},
+				""
+			);
+
+
+
+		public static readonly VOID_DoubleValue maxThrustWeight =
+			new VOID_DoubleValue(
+				"T:W Ratio",
+				delegate()
+				{
+					if (core.LastStage == null)
+					{
+						return double.NaN;
+					}
+
+					return core.LastStage.thrustToWeight;
+				},
+				""
+			);
+
+		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;
+				},
+				""
+			);
+
+		public static readonly VOID_DoubleValue surfaceThrustWeight =
+			new VOID_DoubleValue(
+				"Max T:W @ surface",
+				delegate()
+				{
+					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;
+				},
+				""
+			);
+
+		public static readonly VOID_Vector3dValue vesselThrustOffset =
+			new VOID_Vector3dValue(
+				"Thrust Offset",
+				delegate()
+				{
+					if (core.vessel == null)
+					{
+						return Vector3d.zero;
+					}
+
+					List<PartModule> engineModules = core.vessel.getModulesOfType<PartModule>();
+
+					Vector3d thrustPos = Vector3d.zero;
+					Vector3d thrustDir = Vector3d.zero;
+					float thrust = 0;
+
+					foreach (PartModule engine in engineModules)
+					{
+						float moduleThrust = 0;
+
+						switch (engine.moduleName)
+						{
+							case "ModuleEngines":
+							case "ModuleEnginesFX":
+								break;
+							default:
+								continue;
+						}
+
+						if (!engine.isEnabled)
+						{
+							continue;
+						}
+
+						CenterOfThrustQuery cotQuery = new CenterOfThrustQuery();
+
+						if (engine is ModuleEngines)
+						{
+							ModuleEngines engineModule = engine as ModuleEngines;
+
+							moduleThrust = engineModule.finalThrust;
+
+							engineModule.OnCenterOfThrustQuery(cotQuery);
+						}
+						else // engine is ModuleEnginesFX
+						{
+							ModuleEnginesFX engineFXModule = engine as ModuleEnginesFX;
+
+							moduleThrust = engineFXModule.finalThrust;
+
+							engineFXModule.OnCenterOfThrustQuery(cotQuery);
+						}
+
+						if (moduleThrust != 0d)
+						{
+							cotQuery.thrust = moduleThrust;
+						}
+
+						thrustPos += cotQuery.pos * cotQuery.thrust;
+						thrustDir += cotQuery.dir * cotQuery.thrust;
+						thrust += cotQuery.thrust;
+					}
+
+					if (thrust != 0)
+					{
+						thrustPos /= thrust;
+						thrustDir /= thrust;
+					}
+
+					Transform vesselTransform = core.vessel.transform;
+
+					thrustPos = vesselTransform.InverseTransformPoint(thrustPos);
+					thrustDir = vesselTransform.InverseTransformDirection(thrustDir);
+
+					Vector3d thrustOffset = VectorTools.PointDistanceToLine(
+						                      thrustPos, thrustDir.normalized, core.vessel.findLocalCenterOfMass());
+
+					Tools.PostDebugMessage(typeof(VOID_Data), "vesselThrustOffset:\n" +
+						"\tthrustPos: {0}\n" +
+						"\tthrustDir: {1}\n" +
+						"\tthrustOffset: {2}\n" +
+						"\tvessel.CoM: {3}",
+						thrustPos,
+						thrustDir.normalized,
+						thrustOffset,
+						core.vessel.findWorldCenterOfMass()
+					);
+
+					return thrustOffset;
+				},
+				"m"
+			);
+
+		#endregion
+
+		#region Air Breathing
+
+		public static readonly VOID_StrValue intakeAirStatus =
+			new VOID_StrValue(
+				"Intake Air (Curr / Req)",
+				delegate()
+				{
+					double currentAmount;
+					double currentRequirement;
+
+					currentAmount = 0d;
+					currentRequirement = 0d;
+
+					foreach (Part part in core.vessel.Parts)
+					{
+						if (part.enabled)
+						{
+							ModuleEngines engineModule;
+							ModuleEnginesFX enginesFXModule;
+							List<Propellant> propellantList = null;
+
+							if (part.tryGetFirstModuleOfType<ModuleEngines>(out engineModule))
+							{
+								propellantList = engineModule.propellants;
+							}
+							else if (part.tryGetFirstModuleOfType<ModuleEnginesFX>(out enginesFXModule))
+								{
+									propellantList = enginesFXModule.propellants;
+								}
+
+							if (propellantList != null)
+							{
+								foreach (Propellant propellant in propellantList)
+								{
+									if (propellant.name == "IntakeAir")
+									{
+										currentRequirement += propellant.currentRequirement / TimeWarp.fixedDeltaTime;
+										break;
+									}
+								}
+							}
+						}
+
+						ModuleResourceIntake intakeModule;
+
+						if (part.enabled && part.tryGetFirstModuleOfType<ModuleResourceIntake>(out intakeModule))
+						{
+							if (intakeModule.resourceName == "IntakeAir")
+							{
+								currentAmount += intakeModule.airFlow;
+							}
+						}
+					}
+
+					if (currentAmount == 0 && currentRequirement == 0)
+					{
+						return "N/A";
+					}
+
+					return string.Format("{0:F3} / {1:F3}", currentAmount, currentRequirement);
+				}
+			);
+
+		#endregion
+
+		#region Crew
+
+		public static readonly VOID_IntValue vesselCrewCount =
+			new VOID_IntValue(
+				"Crew Onboard",
+				delegate()
+				{
+					if (core.vessel != null)
+					{
+						return core.vessel.GetCrewCount();
+					}
+					else
+					{
+						return 0;
+					}
+				},
+				""
+			);
+
+		public static readonly VOID_IntValue vesselCrewCapacity =
+			new VOID_IntValue(
+				"Crew Capacity",
+				delegate()
+				{
+					if (core.vessel != null)
+					{
+						return core.vessel.GetCrewCapacity();
+					}
+					else
+					{
+						return 0;
+					}
+				},
+				""
+			);
+
+		#endregion
+
+		#endregion
+
+		#region Location
+
+		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"
+			);
+
+		public static readonly VOID_StrValue surfLatitude =
+			new VOID_StrValue(
+				"Latitude",
+				new Func<string>(() => VOID_Tools.GetLatitudeString(core.vessel))
+			);
+
+		public static readonly VOID_StrValue surfLongitude =
+			new VOID_StrValue(
+				"Longitude",
+				new Func<string>(() => VOID_Tools.GetLongitudeString(core.vessel))
+			);
+
+		public static readonly VOID_DoubleValue trueAltitude =
+			new VOID_DoubleValue(
+				"Altitude (true)",
+				delegate()
+				{
+					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 (core.vessel.terrainAltitude < 0 && core.vessel.mainBody.ocean)
+						alt_true = core.vessel.orbit.altitude;
+					return alt_true;
+				},
+				"m"
+			);
+
+		#endregion
+
+		#region Kinematics
+
+		public static readonly VOID_DoubleValue geeForce =
+			new VOID_DoubleValue(
+				"G-force",
+				new Func<double>(() => core.vessel.geeForce),
+				"gees"
+			);
+
+		public static readonly VOID_DoubleValue horzVelocity =
+			new VOID_DoubleValue(
+				"Horizontal speed",
+				new Func<double>(() => core.vessel.horizontalSrfSpeed),
+				"m/s"
+			);
+
+		public static readonly VOID_DoubleValue surfVelocity =
+			new VOID_DoubleValue(
+				"Surface velocity",
+				new Func<double>(() => core.vessel.srf_velocity.magnitude),
+				"m/s"
+			);
+
+		public static readonly VOID_DoubleValue vertVelocity =
+			new VOID_DoubleValue(
+				"Vertical speed",
+				new Func<double>(() => core.vessel.verticalSpeed),
+				"m/s"
+			);
+
+		public static readonly VOID_DoubleValue vesselAccel =
+			new VOID_DoubleValue(
+				"Acceleration",
+				() => geeForce * KerbinGee,
+				"m/s²"
+			);
+
+		public static readonly VOID_DoubleValue vesselAngularVelocity =
+			new VOID_DoubleValue(
+				"Angular Velocity",
+				delegate()
+				{
+					if (core.vessel != null)
+					{
+						return core.vessel.angularVelocity.magnitude;
+					}
+					else
+					{
+						return double.NaN;
+					}
+				},
+				"rad/s"
+			);
+
+		#endregion
+
+		#region Navigation
+
+		public static int upcomingManeuverNodes
+		{
+			get
+			{
+				if (core.vessel == null ||
+				    core.vessel.patchedConicSolver == null ||
+				    core.vessel.patchedConicSolver.maneuverNodes == null)
+				{
+					return 0;
+				}
+
+				return core.vessel.patchedConicSolver.maneuverNodes.Count;
+			}
+		}
+
+		public static readonly VOID_StrValue burnTimeDoneAtNode =
+			new VOID_StrValue(
+				"Full burn time to be half done at node",
+				delegate()
+				{
+					if (core.LastStage == null && upcomingManeuverNodes < 1)
+					{
+						return "N/A";
+					}
+
+					ManeuverNode node = core.vessel.patchedConicSolver.maneuverNodes[0];
+
+					if ((node.UT - Planetarium.GetUniversalTime()) < 0)
+					{
+						return string.Empty;
+					}
+
+					double interval = (node.UT - currentNodeBurnDuration) - Planetarium.GetUniversalTime();
+
+					if (double.IsNaN(interval))
+					{
+						return string.Intern("NaN");
+					}
+
+					int sign = Math.Sign(interval);
+					interval = Math.Abs(interval);
+
+					string format;
+
+					if (sign >= 0)
+					{
+						format = string.Intern("T - {0}");
+					}
+					else
+					{
+						format = string.Intern("T + {0}");
+					}
+
+					return string.Format(format, VOID_Tools.FormatInterval(interval));
+				}
+			);
+
+		public static readonly VOID_StrValue burnTimeHalfDoneAtNode =
+			new VOID_StrValue(
+				"Full burn time to be half done at node",
+				delegate()
+				{
+					if (core.LastStage == null && upcomingManeuverNodes < 1)
+					{
+						return "N/A";
+					}
+
+					ManeuverNode node = core.vessel.patchedConicSolver.maneuverNodes[0];
+
+					if ((node.UT - Planetarium.GetUniversalTime()) < 0)
+					{
+						return string.Empty;
+					}
+
+					double interval = (node.UT - currentNodeHalfBurnDuration) - Planetarium.GetUniversalTime();
+
+					if (double.IsNaN(interval))
+					{
+						return string.Intern("NaN");
+					}
+
+					int sign = Math.Sign(interval);
+					interval = Math.Abs(interval);
+
+					string format;
+
+					if (sign >= 0)
+					{
+						format = string.Intern("T - {0}");
+					}
+					else
+					{
+						format = string.Intern("T + {0}");
+					}
+
+					return string.Format(format, VOID_Tools.FormatInterval(interval));
+				}
+			);
+
+		public static readonly VOID_DoubleValue currManeuverDeltaV =
+			new VOID_DoubleValue(
+				"Current Maneuver Delta-V",
+				delegate()
+				{
+					if (upcomingManeuverNodes > 0)
+					{
+						return core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude;
+					}
+					else
+					{
+						return double.NaN;
+					}
+				},
+				"m/s"
+			);
+
+		public static readonly VOID_DoubleValue currManeuverDVRemaining =
+			new VOID_DoubleValue(
+				"Remaining Maneuver Delta-V",
+				delegate()
+				{
+					if (upcomingManeuverNodes > 0)
+					{
+						return core.vessel.patchedConicSolver.maneuverNodes[0].GetBurnVector(core.vessel.orbit).magnitude;
+					}
+					else
+					{
+						return double.NaN;
+					}
+				},
+				"m/s"
+			);
+
+		public static readonly VOID_DoubleValue currentNodeBurnDuration =
+			new VOID_DoubleValue(
+				"Total Burn Time",
+				delegate()
+				{
+					if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+					{
+						return double.NaN;
+					}
+
+					double stageThrust = stageNominalThrust;
+
+					return burnTime(currManeuverDeltaV.Value, totalMass, stageMassFlow, stageThrust);
+				},
+				"s"
+			);
+
+		public static readonly VOID_DoubleValue currentNodeBurnRemaining =
+			new VOID_DoubleValue(
+				"Burn Time Remaining",
+				delegate()
+				{
+					if (core.LastStage == null || currManeuverDVRemaining == double.NaN)
+					{
+						return double.NaN;
+					}
+
+					double stageThrust = stageNominalThrust;
+
+					return burnTime(currManeuverDVRemaining, totalMass, stageMassFlow, stageThrust);
+				},
+				"s"
+			);
+
+		public static readonly VOID_DoubleValue currentNodeHalfBurnDuration =
+			new VOID_DoubleValue(
+				"Half Burn Time",
+				delegate()
+				{
+					if (core.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+					{
+						return double.NaN;
+					}
+
+					double stageThrust = stageNominalThrust;
+
+					return burnTime(currManeuverDeltaV.Value / 2d, totalMass, stageMassFlow, stageThrust);
+				},
+				"s"
+			);
+
+		public static readonly VOID_DoubleValue nextManeuverDeltaV =
+			new VOID_DoubleValue(
+				"Current Maneuver Delta-V",
+				delegate()
+				{
+					if (upcomingManeuverNodes > 1)
+					{
+						return core.vessel.patchedConicSolver.maneuverNodes[1].DeltaV.magnitude;
+					}
+					else
+					{
+						return double.NaN;
+					}
+				},
+				"m/s"
+			);
+
+		#endregion
+
+		#region Orbits
+
+		public static readonly VOID_StrValue primaryName =
+			new VOID_StrValue(
+				VOID_Localization.void_primary,
+				delegate()
+				{
+					if (core.vessel == null)
+					{
+						return string.Empty;
+					}
+					return core.vessel.mainBody.name;
+				}
+			);
+
+		public static readonly VOID_DoubleValue orbitAltitude =
+			new VOID_DoubleValue(
+				"Altitude (ASL)",
+				new Func<double>(() => core.vessel.orbit.altitude),
+				"m"
+			);
+
+		public static readonly VOID_DoubleValue orbitVelocity =
+			new VOID_DoubleValue(
+				VOID_Localization.void_velocity,
+				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>(() => core.vessel.orbit.ApA),
+				"m"
+			);
+
+		public static readonly VOID_DoubleValue oribtPeriAlt =
+			new VOID_DoubleValue(
+				VOID_Localization.void_periapsis,
+				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.FormatInterval(core.vessel.orbit.timeToAp))
+			);
+
+		public static readonly VOID_StrValue timeToPeri =
+			new VOID_StrValue(
+				"Time to Periapsis",
+				new Func<string>(() => VOID_Tools.FormatInterval(core.vessel.orbit.timeToPe))
+			);
+
+		public static readonly VOID_DoubleValue orbitInclination =
+			new VOID_DoubleValue(
+				"Inclination",
+				new Func<double>(() => core.vessel.orbit.inclination),
+				"°"
+			);
+
+		public static readonly VOID_DoubleValue gravityAccel =
+			new VOID_DoubleValue(
+				"Gravity",
+				delegate()
+				{
+					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²"
+			);
+
+		public static readonly VOID_StrValue orbitPeriod =
+			new VOID_StrValue(
+				"Period",
+				new Func<string>(() => VOID_Tools.FormatInterval(core.vessel.orbit.period))
+			);
+
+		public static readonly VOID_DoubleValue semiMajorAxis =
+			new VOID_DoubleValue(
+				"Semi-Major Axis",
+				new Func<double>(() => core.vessel.orbit.semiMajorAxis),
+				"m"
+			);
+
+		public static readonly VOID_DoubleValue eccentricity =
+			new VOID_DoubleValue(
+				"Eccentricity",
+				new Func<double>(() => core.vessel.orbit.eccentricity),
+				""
+			);
+
+		public static readonly VOID_DoubleValue meanAnomaly =
+			new VOID_DoubleValue(
+				"Mean Anomaly",
+				new Func<double>(() => core.vessel.orbit.meanAnomaly * 180d / Math.PI),
+				"°"
+			);
+
+		public static readonly VOID_DoubleValue trueAnomaly = 
+			new VOID_DoubleValue(
+				"True Anomaly",
+				new Func<double>(() => core.vessel.orbit.trueAnomaly),
+				"°"
+			);
+
+		public static readonly VOID_DoubleValue eccAnomaly =
+			new VOID_DoubleValue(
+				"Eccentric Anomaly",
+				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>(() => core.vessel.orbit.LAN),
+				"°"
+			);
+
+		public static readonly VOID_DoubleValue argumentPeriapsis =
+			new VOID_DoubleValue(
+				"Argument of Periapsis",
+				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(
+						core.vessel.longitude + core.vessel.orbit.referenceBody.rotationAngle)),
+				"°"
+			);
+
+		#endregion
+
+		#region Science
+
+		public static readonly VOID_StrValue expSituation =
+			new VOID_StrValue(
+				"Situation",
+				new Func<string>(() => core.vessel.GetExperimentSituation().HumanString())
+			);
+
+		public static readonly VOID_StrValue currBiome =
+			new VOID_StrValue(
+				"Biome",
+				new Func<string>(() => VOID_Tools.GetBiome(core.vessel).name)
+			);
+
+		#endregion
+
+		#region Surface
+
+		public static readonly VOID_DoubleValue terrainElevation =
+			new VOID_DoubleValue(
+				"Terrain elevation",
+				new Func<double>(() => core.vessel.terrainAltitude),
+				"m"
+			);
+
+		#endregion
+
+		private static double burnTime(double deltaV, double initialMass, double massFlow, double thrust)
+		{
+			Tools.PostDebugMessage(typeof(VOID_Data), "calculating burnTime from:\n" +
+				"\tdeltaV: {0}\n" +
+				"\tinitialMass: {1}\n" +
+				"\tmassFlow: {2}\n" +
+				"\tthrust: {3}\n",
+				deltaV,
+				initialMass,
+				massFlow,
+				thrust
+			);
+			return initialMass / massFlow * (1d - Math.Exp(-deltaV * massFlow / thrust));
+		}
+	}
+}
+
+

--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -1,26 +1,37 @@
-//
-//  VOID_Orbital.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// VOID
+//
+// VOID_DataLogger.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.Collections.Generic;
+using System.IO;
+using System.Text;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -30,208 +41,455 @@
 		/*
 		 * Fields
 		 * */
-		protected bool stopwatch1_running;
-
-		protected bool csv_logging;
-		protected bool first_write;
-
-		protected double stopwatch1;
-
-		protected string csv_log_interval_str;
-
-		protected float csv_log_interval;
-
-		protected double csvWriteTimer;
-		protected double csvCollectTimer;
-
-		protected List<string> csvList = new List<string>();
+		#region Fields
+
+		protected bool _loggingActive;
+		protected bool firstWrite;
+
+		[AVOID_SaveValue("logInterval")]
+		protected VOID_SaveValue<float> logInterval;
+		protected string logIntervalStr;
+
+		protected float csvCollectTimer;
+
+		protected List<byte> csvBytes;
+
+		protected string _fileName;
+		protected FileStream _outputFile;
+
+		protected uint outstandingWrites;
+
+		protected System.Text.UTF8Encoding _utf8Encoding;
+
+		#endregion
 
 		/*
 		 * Properties
 		 * */
 
+		#region Properties
+
+		// TODO: Add configurable or incremental file names.
+		protected bool loggingActive
+		{
+			get
+			{
+				return this._loggingActive;
+			}
+			set
+			{
+				if (value != this._loggingActive)
+				{
+					if (value)
+					{
+						this.csvCollectTimer = 0f;
+					}
+					else
+					{
+						this.CloseFileIfOpen();
+					}
+
+					this._loggingActive = value;
+				}
+			}
+		}
+
+		protected string fileName
+		{
+			get
+			{
+				if (this._fileName == null || this._fileName == string.Empty)
+				{
+					this._fileName = KSP.IO.IOUtils.GetFilePathFor(
+						typeof(VOID_Core),
+						string.Format(
+							"{0}_{1}",
+							this.vessel.vesselName,
+							"data.csv"
+						),
+						null
+					);
+				}
+
+				return this._fileName;
+			}
+		}
+
+		protected FileStream outputFile
+		{
+			get
+			{
+				if (this._outputFile == null)
+				{
+					Tools.DebugLogger logger = Tools.DebugLogger.New(this);
+					logger.AppendFormat("Initializing output file '{0}' with mode ", this.fileName);
+
+					if (File.Exists(this.fileName))
+					{
+						logger.Append("append");
+						this._outputFile = new FileStream(
+							this.fileName,
+							FileMode.Append,
+							FileAccess.Write,
+							FileShare.Read,
+							512,
+							true
+						);
+					}
+					else
+					{
+						logger.Append("create");
+						this._outputFile = new FileStream(
+							this.fileName,
+							FileMode.Create,
+							FileAccess.Write,
+							FileShare.Read,
+							512,
+							true
+						);
+
+						byte[] byteOrderMark = utf8Encoding.GetPreamble();
+
+						logger.Append(" and writing preamble");
+						this._outputFile.Write(byteOrderMark, 0, byteOrderMark.Length);
+					}
+
+					logger.Append('.');
+
+					logger.AppendFormat("  File is {0}opened asynchronously.", this._outputFile.IsAsync ? "" : "not ");
+
+					logger.Print();
+				}
+
+				return this._outputFile;
+			}
+		}
+
+		public UTF8Encoding utf8Encoding
+		{
+			get
+			{
+				if (this._utf8Encoding == null)
+				{
+					this._utf8Encoding = new UTF8Encoding(true);
+				}
+
+				return this._utf8Encoding;
+			}
+		}
+
+		#endregion
 
 		/*
 		 * Methods
 		 * */
-		public VOID_DataLogger()
-		{
-			this._Name = "CSV Data Logger";
-
-			this.stopwatch1_running = false;
-
-			this.csv_logging = false;
-			this.first_write = true;
-
-			this.stopwatch1 = 0;
-			this.csv_log_interval_str = "0.5";
-
-			this.csvWriteTimer = 0;
-			this.csvCollectTimer = 0;
-
-			this.WindowPos.x = Screen.width - 520;
-			this.WindowPos.y = 85;
-		}
-
-		public override void ModuleWindow(int _)
-		{
-			GUIStyle txt_white = new GUIStyle(GUI.skin.label);
-			txt_white.normal.textColor = txt_white.focused.textColor = Color.white;
-			txt_white.alignment = TextAnchor.UpperRight;
-			GUIStyle txt_green = new GUIStyle(GUI.skin.label);
-			txt_green.normal.textColor = txt_green.focused.textColor = Color.green;
-			txt_green.alignment = TextAnchor.UpperRight;
-			GUIStyle txt_yellow = new GUIStyle(GUI.skin.label);
-			txt_yellow.normal.textColor = txt_yellow.focused.textColor = Color.yellow;
-			txt_yellow.alignment = TextAnchor.UpperRight;
-
-			GUILayout.BeginVertical();
-
-			GUILayout.Label("System time: " + DateTime.Now.ToString("HH:mm:ss"));
-			GUILayout.Label(Tools.ConvertInterval(stopwatch1));
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			if (GUILayout.Button("Start"))
-			{
-				if (stopwatch1_running == false) stopwatch1_running = true;
-			}
-			if (GUILayout.Button("Stop"))
-			{
-				if (stopwatch1_running == true) stopwatch1_running = false;
-			}
-			if (GUILayout.Button("Reset"))
-			{
-				if (stopwatch1_running == true) stopwatch1_running = false;
-				stopwatch1 = 0;
-			}
-			GUILayout.EndHorizontal();
-
-			GUIStyle label_style = txt_white;
-			string log_label = "Inactive";
-			if (csv_logging && vessel.situation.ToString() == "PRELAUNCH")
-			{
-				log_label = "Awaiting launch";
-				label_style = txt_yellow;
-			}
-			if (csv_logging && vessel.situation.ToString() != "PRELAUNCH")
-			{
-				log_label = "Active";
-				label_style = txt_green;
-			}
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			csv_logging = GUILayout.Toggle(csv_logging, "Data logging: ", GUILayout.ExpandWidth(false));
-			GUILayout.Label(log_label, label_style, GUILayout.ExpandWidth(true));
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Interval: ", GUILayout.ExpandWidth(false));
-			csv_log_interval_str = GUILayout.TextField(csv_log_interval_str, GUILayout.ExpandWidth(true));
-			GUILayout.Label("s", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			float new_log_interval;
-			if (Single.TryParse(csv_log_interval_str, out new_log_interval)) csv_log_interval = new_log_interval;
-
-			GUILayout.EndVertical();
-			GUI.DragWindow();
-		}
-
+		#region Monobehaviour Lifecycle
 		public void Update()
 		{
+			if (this.csvBytes != null && this.csvBytes.Count > 0)
+			{
+				// csvList is not empty, write it
+				this.AsyncWriteData();
+			}
+
 			// CSV Logging
 			// from ISA MapSat
-			if (csv_logging)
+			if (loggingActive)
 			{
 				//data logging is on
 				//increment timers
-				csvWriteTimer += Time.deltaTime;
-				csvCollectTimer += Time.deltaTime;
-
-				if (csvCollectTimer >= csv_log_interval && vessel.situation != Vessel.Situations.PRELAUNCH)
+				this.csvCollectTimer += Time.deltaTime;
+
+				if (this.csvCollectTimer >= this.logInterval)
 				{
 					//data logging is on, vessel is not prelaunch, and interval has passed
 					//write a line to the list
-					line_to_csvList();  //write to the csv
+					this.CollectLogData();
 				}
-
-				if (csvList.Count != 0 && csvWriteTimer >= 15f)
-				{
-					// csvList is not empty and interval between writings to file has elapsed
-					//write it
-					string[] csvData;
-					csvData = (string[])csvList.ToArray();
-					Innsewerants_writeData(csvData);
-					csvList.Clear();
-					csvWriteTimer = 0f;
-				}
-			}
-			else
-			{
-				//data logging is off
-				//reset any timers and clear anything from csvList
-				csvWriteTimer = 0f;
-				csvCollectTimer = 0f;
-				if (csvList.Count > 0) csvList.Clear();
-			}
-
-			if (stopwatch1_running)
-			{
-				stopwatch1 += Time.deltaTime;
 			}
 		}
 
 		public void FixedUpdate() {}
 
-		private void Innsewerants_writeData(string[] csvArray)
-		{
-			var efile = KSP.IO.File.AppendText<VOID_Core>(vessel.vesselName + "_data.csv", null);
-			foreach (string line in csvArray)
-			{
-				efile.Write(line);
-			}
-			efile.Close();
-		}
-
-		private void line_to_csvList()
-		{
+		public void OnDestroy()
+		{
+			Tools.DebugLogger logger = Tools.DebugLogger.New(this);
+
+			logger.Append("Destroying...");
+
+			this.CloseFileIfOpen();
+
+			logger.Append(" Done.");
+			logger.Print(false);
+		}
+
+		#endregion
+
+		#region VOID_Module Overrides
+
+		public override void LoadConfig()
+		{
+			base.LoadConfig();
+
+			this.logIntervalStr = this.logInterval.value.ToString("#.0##");
+		}
+
+		public override void ModuleWindow(int _)
+		{
+			GUILayout.BeginVertical();
+
+			GUILayout.Label(
+				string.Format("System time: {0}", DateTime.Now.ToString("HH:mm:ss")),
+				GUILayout.ExpandWidth(true)
+			);
+			GUILayout.Label(
+				string.Format("Kerbin time: {0}", VOID_Tools.FormatDate(Planetarium.GetUniversalTime())),
+				GUILayout.ExpandWidth(true)
+			);
+
+			GUIStyle activeLabelStyle = VOID_Styles.labelRed;
+			string activeLabelText = "Inactive";
+			if (loggingActive)
+			{
+				activeLabelText = "Active";
+				activeLabelStyle = VOID_Styles.labelGreen;
+			}
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+			this.loggingActive = GUILayout.Toggle(loggingActive, "Data logging: ", GUILayout.ExpandWidth(false));
+			GUILayout.Label(activeLabelText, activeLabelStyle, GUILayout.ExpandWidth(true));
+
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+			GUILayout.Label("Interval: ", GUILayout.ExpandWidth(false));
+
+			logIntervalStr = GUILayout.TextField(logIntervalStr, GUILayout.ExpandWidth(true));
+			GUILayout.Label("s", GUILayout.ExpandWidth(false));
+
+			GUILayout.EndHorizontal();
+
+			float newLogInterval;
+			if (float.TryParse(logIntervalStr, out newLogInterval))
+			{
+				logInterval.value = newLogInterval;
+				this.logIntervalStr = this.logInterval.value.ToString("#.0##");
+			}
+
+			GUILayout.EndVertical();
+
+			GUI.DragWindow();
+		}
+
+		#endregion
+
+		#region Data Collection
+
+		private void CollectLogData()
+		{
+			if (this.csvBytes == null)
+			{
+				this.csvBytes = new List<byte>();
+			}
+
 			//called if logging is on and interval has passed
 			//writes one line to the csvList
 
-			string line = "";
-			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";
-			}
+			StringBuilder line = new StringBuilder();
+
+			if (firstWrite)
+			{
+				firstWrite = false;
+				line.Append(
+					"\"Kerbin Universal Time (s)\"," +
+					"\"Mission Elapsed Time (s)\t\"," +
+					"\"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³)\"," +
+					"\"Downrange Distance  (m)\"," +
+					"\n"
+				);
+			}
+
+			// Universal time
+			line.Append(Planetarium.GetUniversalTime().ToString("F2"));
+			line.Append(',');
+
 			//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(VOID_Data.orbitAltitude.Value.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(VOID_Data.trueAltitude.Value.ToString("F3"));
+			line.Append(',');
+
+			// Surface Latitude
+			line.Append('"');
+			line.Append(VOID_Data.surfLatitude.Value);
+			line.Append('"');
+			line.Append(',');
+
+			// Surface Longitude
+			line.Append('"');
+			line.Append(VOID_Data.surfLongitude.Value);
+			line.Append('"');
+			line.Append(',');
+
 			//Orbital velocity
-			line += vessel.orbit.vel.magnitude.ToString("F3") + ";";
+			line.Append(VOID_Data.orbitVelocity.Value.ToString("F3"));
+			line.Append(',');
+
 			//surface velocity
-			line += vessel.srf_velocity.magnitude.ToString("F3") + ";";
+			line.Append(VOID_Data.surfVelocity.Value.ToString("F3"));
+			line.Append(',');
+
 			//vertical speed
-			line += vessel.verticalSpeed.ToString("F3") + ";";
+			line.Append(VOID_Data.vertVelocity.Value.ToString("F3"));
+			line.Append(',');
+
 			//horizontal speed
-			line += vessel.horizontalSrfSpeed.ToString("F3") + ";";
+			line.Append(VOID_Data.horzVelocity.Value.ToString("F3"));
+			line.Append(',');
+
 			//gee force
-			line += vessel.geeForce.ToString("F3") + ";";
+			line.Append(VOID_Data.geeForce.Value.ToString("F3"));
+			line.Append(',');
+
 			//temperature
-			line += vessel.flightIntegrator.getExternalTemperature().ToString("F2") + ";";
+			line.Append(VOID_Data.temperature.Value.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) / Math.Pow(r_vessel, 2);
-			line += g_vessel.ToString("F3") + ";";
+			line.Append(VOID_Data.gravityAccel.Value.ToString("F3"));
+			line.Append(',');
+
 			//atm density
-			line += (vessel.atmDensity * 1000).ToString("F3") + ";";
-			line += "\n";
-			if (csvList.Contains(line) == false) csvList.Add(line);
-			csvCollectTimer = 0f;
-		}
+			line.Append(VOID_Data.atmDensity.Value.ToString("G3"));
+			line.Append(',');
+
+			// Downrange Distance
+			line.Append((VOID_Data.downrangeDistance.Value.ToString("G3")));
+
+			line.Append('\n');
+
+			csvBytes.AddRange(this.utf8Encoding.GetBytes(line.ToString()));
+
+			this.csvCollectTimer = 0f;
+		}
+
+		#endregion
+
+		#region File IO Methods
+
+		protected void AsyncWriteCallback(IAsyncResult result)
+		{
+			Tools.PostDebugMessage(this, "Got async callback, IsCompleted = {0}", result.IsCompleted);
+
+			this.outputFile.EndWrite(result);
+			this.outstandingWrites--;
+		}
+
+		private void AsyncWriteData()
+		{
+			WriteState state = new WriteState();
+
+			state.bytes = this.csvBytes.ToArray();
+			state.stream = this.outputFile;
+
+			this.outstandingWrites++;
+			var writeCallback = new AsyncCallback(this.AsyncWriteCallback);
+
+			this.outputFile.BeginWrite(state.bytes, 0, state.bytes.Length, writeCallback, state);
+
+			this.csvBytes.Clear();
+		}
+
+		private void CloseFileIfOpen()
+		{
+			Tools.DebugLogger logger = Tools.DebugLogger.New(this);
+
+			logger.AppendFormat("Cleaning up file {0}...", this.fileName);
+
+			if (this.csvBytes != null && this.csvBytes.Count > 0)
+			{
+				logger.Append(" Writing remaining data...");
+				this.AsyncWriteData();
+			}
+
+			logger.Append(" Waiting for writes to finish.");
+			while (this.outstandingWrites > 0)
+			{
+				logger.Append('.');
+				System.Threading.Thread.Sleep(10);
+			}
+
+			if (this._outputFile != null)
+			{
+				this._outputFile.Close();
+				this._outputFile = null;
+				logger.Append(" File closed.");
+			}
+
+			logger.Print(false);
+		}
+
+		#endregion
+
+		#region Constructors & Destructors
+
+		public VOID_DataLogger()
+		{
+			this._Name = "CSV Data Logger";
+
+			this.loggingActive = false;
+			this.firstWrite = true;
+
+			this.logInterval = 0.5f;
+			this.csvCollectTimer = 0f;
+
+			this.outstandingWrites = 0;
+
+			this.WindowPos.x = Screen.width - 520f;
+			this.WindowPos.y = 85f;
+
+			this.core.onApplicationQuit += delegate(object sender)
+			{
+				this.CloseFileIfOpen();
+			};
+		}
+
+		~VOID_DataLogger()
+		{
+			this.OnDestroy();
+		}
+
+		#endregion
+
+		#region Subclasses
+
+		private class WriteState
+		{
+			public byte[] bytes;
+			public FileStream stream;
+		}
+
+		#endregion
 	}
 }
+
+

--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -1,30 +1,43 @@
-//
-//  VOID_DataValue.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// VOID
+//
+// VOID_DataValue.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 System;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
 {
 	public interface IVOID_DataValue
 	{
+		string Label { get; }
+		string Units { get; }
+		object Value { get; }
+
 		void Refresh();
 		string ValueUnitString();
 		void DoGUIHorizontal();
@@ -48,6 +61,7 @@
 		 * */
 		protected T cache;
 		protected Func<T> ValueFunc;
+		protected float lastUpdate;
 
 		/* 
 		 * Properties
@@ -55,8 +69,26 @@
 		public string Label { get; protected set; }
 		public string Units { get; protected set; }
 
-		public T Value {
-			get {
+		object IVOID_DataValue.Value
+		{
+			get
+			{
+				return (object)this.Value;
+			}
+		}
+
+		public T Value
+		{
+			get
+			{
+				if (
+					HighLogic.LoadedSceneIsEditor ||
+					(VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) ||
+					(this.lastUpdate > VOID_Core.Instance.updateTimer)
+				)
+				{
+					this.Refresh();
+				}
 				return (T)this.cache;
 			}
 		}
@@ -69,11 +101,15 @@
 			this.Label = Label;
 			this.Units = Units;
 			this.ValueFunc = ValueFunc;
+			this.lastUpdate = 0;
+
+			VOID_Data.DataValues[this.GetHashCode()] = this;
 		}
 
 		public void Refresh()
 		{
 			this.cache = this.ValueFunc.Invoke ();
+			this.lastUpdate = VOID_Core.Instance.updateTimer;
 		}
 
 		public T GetFreshValue()
@@ -82,7 +118,7 @@
 			return (T)this.cache;
 		}
 
-		public string ValueUnitString() {
+		public virtual string ValueUnitString() {
 			return this.Value.ToString() + this.Units;
 		}
 
@@ -93,6 +129,21 @@
 			GUILayout.FlexibleSpace ();
 			GUILayout.Label (this.ValueUnitString(), GUILayout.ExpandWidth (false));
 			GUILayout.EndHorizontal ();
+		}
+
+		public override int GetHashCode()
+		{
+			int hash;
+			unchecked
+			{
+				hash = 79999;
+
+				hash = hash * 104399 + this.Label.GetHashCode();
+				hash = hash * 104399 + this.ValueFunc.GetHashCode();
+				hash = hash * 104399 + this.Units.GetHashCode();
+			}
+
+			return hash;
 		}
 
 		public override string ToString()
@@ -106,30 +157,93 @@
 		}
 	}
 
-	internal interface IVOID_NumericValue
-	{
-		double ToDouble();
-		string ToString(string format);
-		string ToSIString(int digits, int MinMagnitude, int MaxMagnitude);
-	}
-
-	public abstract class VOID_NumValue<T> : VOID_DataValue<T>, IVOID_NumericValue
-	{
-		public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units) {}
-
-		public abstract double ToDouble();
-		public abstract string ToString(string Format);
-		public abstract string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue);
-
-		public abstract string ValueUnitString(string format);
+	public abstract class VOID_NumValue<T> : VOID_DataValue<T>
+		where T : IFormattable, IConvertible, IComparable
+	{
+		public static implicit operator Double(VOID_NumValue<T> v)
+		{
+			return v.ToDouble();
+		}
+
+		public static implicit operator Int32(VOID_NumValue<T> v)
+		{
+			return v.ToInt32();
+		}
+
+
+		public static implicit operator Single(VOID_NumValue<T> v)
+		{
+			return v.ToSingle();
+		}
+
+		protected IFormatProvider formatProvider;
+
+		public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units)
+		{
+			this.formatProvider = System.Globalization.CultureInfo.CurrentUICulture;
+		}
+
+		public virtual double ToDouble(IFormatProvider provider)
+		{
+			return this.Value.ToDouble(provider);
+		}
+
+		public virtual double ToDouble()
+		{
+			return this.ToDouble(this.formatProvider);
+		}
+
+		public virtual int ToInt32(IFormatProvider provider)
+		{
+			return this.Value.ToInt32(provider);
+		}
+
+		public virtual int ToInt32()
+		{
+			return this.ToInt32(this.formatProvider);
+		}
+
+		public virtual float ToSingle(IFormatProvider provider)
+		{
+			return this.Value.ToSingle(provider);
+		}
+
+		public virtual float ToSingle()
+		{
+			return this.ToSingle(this.formatProvider);
+		}
+
+		public virtual string ToString(string Format)
+		{
+			return string.Format (
+				"{0}: {1}{2}",
+				this.Label,
+				this.Value.ToString(Format, this.formatProvider),
+				this.Units
+			);
+		}
+
+		public virtual string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
+		{
+			return string.Format (
+				"{0}{1}",
+				Tools.MuMech_ToSI (this, digits, MinMagnitude, MaxMagnitude),
+				this.Units
+			);
+		}
+
+		public virtual string ValueUnitString(string format)
+		{
+			return this.Value.ToString(format, this.formatProvider) + this.Units;
+		}
 		
 		public virtual string ValueUnitString(int digits) {
-			return Tools.MuMech_ToSI(this.ToDouble(), digits) + this.Units;
+			return Tools.MuMech_ToSI(this, digits) + this.Units;
 		}
 
 		public virtual string ValueUnitString(int digits, int MinMagnitude, int MaxMagnitude)
 		{
-			return Tools.MuMech_ToSI(this.ToDouble(), digits, MinMagnitude, MaxMagnitude) + this.Units;
+			return Tools.MuMech_ToSI(this, digits, MinMagnitude, MaxMagnitude) + this.Units;
 		}
 
 		public virtual void DoGUIHorizontal(string format)
@@ -159,19 +273,26 @@
 
 		public virtual int DoGUIHorizontalPrec(int digits)
 		{
-			float magnitude;
-			float magLimit;
-
-			magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
-
-			magLimit = Mathf.Max(magnitude, 6f);
-			magLimit = Mathf.Round((float)Math.Ceiling(magLimit / 3f) * 3f);
+			double magnitude;
+			double magLimit;
+
+			magnitude = Math.Log10(Math.Abs((double)this));
+
+			magLimit = Math.Max(Math.Abs(magnitude), 3d) + 3d;
+			magLimit = Math.Round(Math.Ceiling(magLimit / 3f)) * 3d;
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(this.Label + "ⁱ:", GUILayout.ExpandWidth(true));
 			GUILayout.FlexibleSpace();
 
-			GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+			if (magnitude >= 0)
+			{
+				GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+			}
+			else
+			{
+				GUILayout.Label(this.ValueUnitString(3, (int)magnitude + digits, int.MaxValue), GUILayout.ExpandWidth(false));
+			}
 			GUILayout.EndHorizontal();
 
 			if (Event.current.type == EventType.mouseUp)
@@ -179,6 +300,11 @@
 				Rect lastRect = GUILayoutUtility.GetLastRect();
 				if (lastRect.Contains(Event.current.mousePosition))
 				{
+					Tools.PostDebugMessage(string.Format("{0}: Changing digits from {1} within magLimit {2}.",
+						this.GetType().Name,
+						digits,
+						magLimit));
+
 					if (Event.current.button == 0)
 					{
 						digits = (digits + 3) % (int)magLimit;
@@ -186,11 +312,22 @@
 					else if (Event.current.button == 1)
 					{
 						digits = (digits - 3) % (int)magLimit;
-						if (digits < 0)
-						{
-							digits = (int)magLimit - 3;
-						}
 					}
+
+					if (digits < 0)
+					{
+						digits += (int)magLimit;
+					}
+
+					Tools.PostDebugMessage(string.Format("{0}: Changed digits to {1}." +
+						"\n\tNew minMagnitude: {2}, maxMagnitude: {3}" +
+						"\n\tMagnitude: {4}",
+						this.GetType().Name,
+						digits,
+						magnitude >= 0 ? int.MinValue : (int)magnitude - 4 + digits,
+						magnitude >= 0 ? (int)magnitude - digits : int.MaxValue,
+						magnitude
+					));
 				}
 			}
 
@@ -198,107 +335,44 @@
 		}
 	}
 
-	public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
+	public class VOID_DoubleValue : VOID_NumValue<double>
 	{
 		public VOID_DoubleValue(string Label, Func<double> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
-		public override double ToDouble ()
-		{
-			return this.Value;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
+	}
+
+	public class VOID_FloatValue : VOID_NumValue<float>
+	{
+		public VOID_FloatValue(string Label, Func<float> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
+	}
+
+	public class VOID_IntValue : VOID_NumValue<int>
+	{
+		public VOID_IntValue(string Label, Func<int> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
+	}
+
+	public class VOID_StrValue : VOID_DataValue<string>
+	{
+		public VOID_StrValue(string Label, Func<string> ValueFunc) : base(Label, ValueFunc, "") {}
+	}
+
+	public class VOID_Vector3dValue : VOID_DataValue<Vector3d>
+	{
+		public VOID_Vector3dValue(string Label, Func<Vector3d> ValueFunc, string Units)
+			: base(Label, ValueFunc, Units)
+		{}
+
+		public string ToString(string format)
+		{
+			return string.Format("{0}: {1}{2}",
 				this.Label,
-				this.Value.ToString (format),
+				this.Value.ToString(format),
 				this.Units
 			);
 		}
 
-		public override string ValueUnitString(string format) {
+		public string ValueUnitString(string format) {
 			return this.Value.ToString(format) + this.Units;
 		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI (this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-	public class VOID_FloatValue : VOID_NumValue<float>, IVOID_NumericValue
-	{
-		public VOID_FloatValue(string Label, Func<float> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
-		public override double ToDouble ()
-		{
-			return (double)this.Value;
-		}
-
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-	public class VOID_IntValue : VOID_NumValue<int>, IVOID_NumericValue
-	{
-		public VOID_IntValue(string Label, Func<int> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
-		public override double ToDouble ()
-		{
-			return (double)this.Value;
-		}
-
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-
-
-	public class VOID_StrValue : VOID_DataValue<string>
-	{
-		public VOID_StrValue(string Label, Func<string> ValueFunc) : base(Label, ValueFunc, "") {}
 	}
 }
 

--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -1,28 +1,37 @@
+// VOID
 //
-//  VOID_EditorCore.cs
+// VOID_EditorCore.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-using Engineer.VesselSimulator;
+// 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 KerbalEngineer.VesselSimulator;
 using KSP;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -60,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;
 			}
 		}
 
@@ -70,7 +88,7 @@
 			this._Name = "VOID Editor Core";
 		}
 
-		public new void OnGUI() {}
+		public override void OnGUI() {}
 
 		public override void DrawGUI()
 		{
@@ -81,7 +99,7 @@
 
 			Rect _iconPos = Tools.DockToWindow (this.VOIDIconPos, this.mainWindowPos);
 
-			_iconPos = Tools.ClampRectToScreen (_iconPos, (int)_iconPos.width, (int)_iconPos.height);
+			_iconPos = Tools.ClampRectToEditorPad (_iconPos);
 
 			if (_iconPos != this.VOIDIconPos)
 			{
@@ -91,11 +109,13 @@
 			base.DrawGUI();
 		}
 
-		public new void Update()
+		public override void Update()
 		{
+			this.LoadBeforeUpdate();
+
 			foreach (IVOID_EditorModule module in this.Modules)
 			{
-				if (EditorLogic.startPod == null)
+				if (EditorLogic.RootPart == null)
 				{
 					module.StopGUI();
 					continue;
@@ -110,7 +130,7 @@
 				}
 			}
 
-			if (EditorLogic.startPod == null || !HighLogic.LoadedSceneIsEditor)
+			if (EditorLogic.RootPart == null || !HighLogic.LoadedSceneIsEditor)
 			{
 				this.StopGUI();
 				return;
@@ -120,16 +140,16 @@
 				this.StartGUI();
 			}
 
-			if (EditorLogic.SortedShipList.Count > 0)
+			if (EditorLogic.SortedShipList.Count > 0 && this.vesselSimActive)
 			{
-				SimManager.Instance.Gravity = 9.08665;
-				SimManager.Instance.TryStartSimulation();
+				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
@@ -1,63 +1,94 @@
-//
-//  VOID_Hud.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-using Engineer.VesselSimulator;
+// VOID
+//
+// VOID_EditorHUD.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 KerbalEngineer.VesselSimulator;
 using KSP;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
 {
-	public class VOID_EditorHUD : VOID_Module, IVOID_EditorModule
+	public class VOID_EditorHUD : VOID_HUDModule, IVOID_EditorModule
 	{
 		/*
 		 * Fields
 		 * */
-		[AVOID_SaveValue("colorIndex")]
-		protected VOID_SaveValue<int> _colorIndex = 0;
-
-		protected List<Color> textColors = new List<Color>();
-
-		protected GUIStyle labelStyle;
+		[AVOID_SaveValue("ehudWindowPos")]
+		protected VOID_SaveValue<Rect> ehudWindowPos;
+
+		protected HUDWindow ehudWindow;
+		protected EditorVesselOverlays _vesselOverlays;
 
 		/*
 		 * Properties
 		 * */
-		public int ColorIndex
+		protected EditorVesselOverlays vesselOverlays
 		{
 			get
 			{
-				return this._colorIndex;
-			}
-			set
-			{
-				if (this._colorIndex >= this.textColors.Count - 1)
+				if (this._vesselOverlays == null)
 				{
-					this._colorIndex = 0;
-					return;
+					this._vesselOverlays = (EditorVesselOverlays)Resources
+						.FindObjectsOfTypeAll(typeof(EditorVesselOverlays))
+						.FirstOrDefault();
 				}
 
-				this._colorIndex = value;
+				return this._vesselOverlays;
+			}
+		}
+
+		protected EditorMarker_CoM CoMmarker
+		{
+			get
+			{
+				if (this.vesselOverlays == null)
+				{
+					return null;
+				}
+
+				return this.vesselOverlays.CoMmarker;
+			}
+		}
+
+		protected EditorMarker_CoT CoTmarker
+		{
+			get
+			{
+				if (this.vesselOverlays == null)
+				{
+					return null;
+				}
+
+				return this.vesselOverlays.CoTmarker;
 			}
 		}
 
@@ -68,71 +99,121 @@
 		{
 			this._Name = "Heads-Up Display";
 
-			this._Active.value = true;
-
-			this.textColors.Add(Color.green);
-			this.textColors.Add(Color.black);
-			this.textColors.Add(Color.white);
-			this.textColors.Add(Color.red);
-			this.textColors.Add(Color.blue);
-			this.textColors.Add(Color.yellow);
-			this.textColors.Add(Color.gray);
-			this.textColors.Add(Color.cyan);
-			this.textColors.Add(Color.magenta);
-
-			this.labelStyle = new GUIStyle ();
-			// this.labelStyle.alignment = TextAnchor.UpperRight;
-			this.labelStyle.normal.textColor = this.textColors [this.ColorIndex];
+			this.toggleActive = true;
+
+			this.ehudWindow = new HUDWindow(
+				this.ehudWindowFunc,
+				new Rect(EditorPanels.Instance.partsPanelWidth + 10f, 125f, 300f, 64f)
+			);
+			this.Windows.Add(this.ehudWindow);
+			this.ehudWindowPos = this.ehudWindow.WindowPos;
 
 			Tools.PostDebugMessage (this.GetType().Name + ": Constructed.");
 		}
 
+		public void ehudWindowFunc(int id)
+		{
+			StringBuilder hudString = new StringBuilder();
+
+			if (this.core.LastStage == null)
+			{
+				return;
+			}
+
+			// GUI.skin = AssetBase.GetGUISkin("KSP window 2");
+
+			hudString.Append("Total Mass: ");
+			hudString.Append(this.core.LastStage.totalMass.ToString("F3"));
+			hudString.Append('t');
+
+			hudString.Append(' ');
+
+			hudString.Append("Part Count: ");
+			hudString.Append(EditorLogic.SortedShipList.Count);
+
+			hudString.Append('\n');
+
+			hudString.Append("Total Delta-V: ");
+			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(this.core.LastStage.deltaV));
+			hudString.Append("m/s");
+
+			hudString.Append('\n');
+
+			hudString.Append("Bottom Stage T/W Ratio: ");
+			hudString.Append(this.core.LastStage.thrustToWeight.ToString("F3"));
+
+			if (this.CoMmarker.gameObject.activeInHierarchy && this.CoTmarker.gameObject.activeInHierarchy)
+			{
+				hudString.Append('\n');
+
+				hudString.Append("Thrust Offset: ");
+				hudString.Append(
+					Vector3.Cross(
+						this.CoTmarker.dirMarkerObject.transform.forward,
+						this.CoMmarker.posMarkerObject.transform.position - this.CoTmarker.posMarkerObject.transform.position
+					).ToString("F3"));
+			}
+
+			GUILayout.Label(hudString.ToString(), VOID_Styles.labelHud, GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
+		}
+
 		public override void DrawGUI()
 		{
-			SimManager.Instance.RequestSimulation();
-
-			if (SimManager.Instance.LastStage == null)
+			float hudLeft;
+
+			if (EditorLogic.fetch.editorScreen == EditorScreen.Parts)
+			{
+				hudLeft = EditorPanels.Instance.partsPanelWidth + 10f;
+				hudLeft += EditorPartList.Instance.transformTopLeft.position.x -
+					EditorPartList.Instance.transformTopLeft.parent.parent.position.x -
+					72f;
+			}
+			else if (EditorLogic.fetch.editorScreen == EditorScreen.Actions)
+			{
+				hudLeft = EditorPanels.Instance.actionsPanelWidth + 10f;
+			}
+			else
 			{
 				return;
 			}
 
-			float hudLeft;
-
-			if (EditorLogic.fetch.editorScreen == EditorLogic.EditorScreen.Parts)
-			{
-				hudLeft = EditorPanels.Instance.partsPanelWidth + 10;
-			}
-			else if (EditorLogic.fetch.editorScreen == EditorLogic.EditorScreen.Actions)
-			{
-				hudLeft = EditorPanels.Instance.actionsPanelWidth + 10;
-			}
-			else
-			{
-				return;
-			}
-
-			Rect hudPos = new Rect (hudLeft, 48, 300, 32);
-
-			// GUI.skin = AssetBase.GetGUISkin("KSP window 2");
-
-			labelStyle.normal.textColor = textColors [ColorIndex];
-
-			GUI.Label (
-				hudPos,
-				"Total Mass: " + SimManager.Instance.LastStage.totalMass.ToString("F3") + "t" +
-				" Part Count: " + EditorLogic.SortedShipList.Count +
-				"\nTotal Delta-V: " + Tools.MuMech_ToSI(SimManager.Instance.LastStage.totalDeltaV) + "m/s" +
-				"\nBottom Stage Delta-V: " + Tools.MuMech_ToSI(SimManager.Instance.LastStage.deltaV) + "m/s" +
-				"\nBottom Stage T/W Ratio: " + SimManager.Instance.LastStage.thrustToWeight.ToString("F3"),
-				labelStyle);
-		}
-
-		public override void DrawConfigurables()
-		{
-			if (GUILayout.Button ("Change HUD color", GUILayout.ExpandWidth (false)))
-			{
-				++this.ColorIndex;
-			}
+			bool snapToEdge = Mathf.Abs(this.ehudWindowPos.value.xMin - hudLeft) < 15f;
+
+			Tools.PostDebugMessage(this,
+				"EditorPartList topLeft.parent.parent.position: {0}\n" +
+				"EditorPartList topLeft.parent.position: {1}\n" +
+				"EditorPartList topLeft.position: {2}\n" +
+				"snapToEdge: {3} (pos.Xmin: {4}; hudLeft: {5})",
+				EditorPartList.Instance.transformTopLeft.parent.parent.position,
+				EditorPartList.Instance.transformTopLeft.parent.position,
+				EditorPartList.Instance.transformTopLeft.position,
+				snapToEdge, this.ehudWindowPos.value.xMin, hudLeft
+			);
+
+			base.DrawGUI();
+
+			Rect hudPos = this.ehudWindow.WindowPos;
+
+			hudPos.xMin = hudLeft;
+			hudPos.width = this.ehudWindow.defaultWindowPos.width;
+
+			this.ehudWindowPos.value = hudPos;
+
+			this.ehudWindow.WindowPos = this.ehudWindowPos;
+
 		}
 	}
 }

--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -1,62 +1,57 @@
+// VOID
 //
-//  VOID_Hud.cs
+// VOID_HUD.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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 KerbalEngineer.VesselSimulator;
 using KSP;
-using UnityEngine;
 using System;
 using System.Collections.Generic;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
 
 namespace VOID
 {
-	public class VOID_HUD : VOID_Module, IVOID_Module
+	public class VOID_HUD : VOID_HUDModule, IVOID_Module
 	{
 		/*
 		 * Fields
 		 * */
-		[AVOID_SaveValue("colorIndex")]
-		protected VOID_SaveValue<int> _colorIndex = 0;
+		[AVOID_SaveValue("leftHUDPos")]
+		protected VOID_SaveValue<Rect> leftHUDPos;
+		[AVOID_SaveValue("rightHUDPos")]
+		protected VOID_SaveValue<Rect> rightHUDPos;
 
-		protected List<Color> textColors = new List<Color>();
+		protected HUDWindow leftWindow;
+		protected HUDWindow rightWindow;
 
 		/*
 		 * Properties
 		 * */
-		public int ColorIndex
-		{
-			get
-			{
-				return this._colorIndex;
-			}
-			set
-			{
-				if (this._colorIndex >= this.textColors.Count - 1)
-				{
-					this._colorIndex = 0;
-					return;
-				}
-
-				this._colorIndex = value;
-			}
-		}
 
 		/* 
 		 * Methods
@@ -65,71 +60,135 @@
 		{
 			this._Name = "Heads-Up Display";
 
-			this._Active.value = true;
+			this.toggleActive = true;
 
-			this.textColors.Add(Color.green);
-			this.textColors.Add(Color.black);
-			this.textColors.Add(Color.white);
-			this.textColors.Add(Color.red);
-			this.textColors.Add(Color.blue);
-			this.textColors.Add(Color.yellow);
-			this.textColors.Add(Color.gray);
-			this.textColors.Add(Color.cyan);
-			this.textColors.Add(Color.magenta);
+			this.leftWindow = new HUDWindow(this.leftHUDWindow, new Rect(Screen.width * .375f - 300f, 0f, 300f, 90f));
+			this.Windows.Add(this.leftWindow);
 
-			VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle();
-			VOID_Core.Instance.LabelStyles["hud"].normal.textColor = this.textColors [this.ColorIndex];
+			this.leftHUDPos = this.leftWindow.WindowPos;
+
+			this.rightWindow = new HUDWindow(this.rightHUDWindow, new Rect(Screen.width * .625f, 0f, 300f, 90f));
+			this.Windows.Add(this.rightWindow);
+
+			this.rightHUDPos = this.rightWindow.WindowPos;
 
 			Tools.PostDebugMessage ("VOID_HUD: Constructed.");
 		}
 
 		public override void DrawGUI()
 		{
-			GUI.skin = VOID_Core.Instance.Skin;
+			base.DrawGUI();
 
-			if (VOID_Core.Instance.powerAvailable)
+			this.leftHUDPos.value = this.leftWindow.WindowPos;
+			this.rightHUDPos.value = this.rightWindow.WindowPos;
+		}
+
+		protected void leftHUDWindow(int id)
+		{
+			StringBuilder leftHUD;
+
+			leftHUD = new StringBuilder();
+
+			VOID_Styles.labelHud.alignment = TextAnchor.UpperRight;
+
+			if (this.core.powerAvailable)
 			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
-
-				GUI.Label (
-					new Rect ((Screen.width * .2083f), 0, 300f, 70f),
-					"Obt Alt: " + Tools.MuMech_ToSI (vessel.orbit.altitude) + "m" +
-					" Obt Vel: " + Tools.MuMech_ToSI (vessel.orbit.vel.magnitude) + "m/s" +
-					"\nAp: " + Tools.MuMech_ToSI (vessel.orbit.ApA) + "m" +
-					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToAp) +
-					"\nPe: " + Tools.MuMech_ToSI (vessel.orbit.PeA) + "m" +
-					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
-					"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
-					"\nPrimary: " + vessel.mainBody.bodyName,
-					VOID_Core.Instance.LabelStyles["hud"]);
-				// Toadicus edit: Added "Biome: " line to surf/atmo HUD
-				GUI.Label (
-					new Rect ((Screen.width * .625f), 0, 300f, 90f),
-					"Srf Alt: " + Tools.MuMech_ToSI (Tools.TrueAltitude (vessel)) + "m" +
-					" Srf Vel: " + Tools.MuMech_ToSI (vessel.srf_velocity.magnitude) + "m/s" +
-					"\nVer: " + Tools.MuMech_ToSI (vessel.verticalSpeed) + "m/s" +
-					" Hor: " + Tools.MuMech_ToSI (vessel.horizontalSrfSpeed) + "m/s" +
-					"\nLat: " + Tools.GetLatitudeString (vessel, "F3") +
-					" Lon: " + Tools.GetLongitudeString (vessel, "F3") +
-					"\nHdg: " + Tools.MuMech_get_heading (vessel).ToString ("F2") + "° " +
-					Tools.get_heading_text (Tools.MuMech_get_heading (vessel)) +
-					"\nBiome: " + Tools.Toadicus_GetAtt (vessel).name,
-					VOID_Core.Instance.LabelStyles["hud"]);
+				leftHUD.AppendFormat("Primary: {0} Inc: {1}",
+					VOID_Data.primaryName.ValueUnitString(),
+					VOID_Data.orbitInclination.ValueUnitString("F3")
+				);
+				leftHUD.AppendFormat("\nObt Alt: {0} Obt Vel: {1}",
+					VOID_Data.orbitAltitude.ToSIString(),
+					VOID_Data.orbitVelocity.ToSIString()
+				);
+				leftHUD.AppendFormat("\nAp: {0} ETA {1}",
+					VOID_Data.orbitApoAlt.ToSIString(),
+					VOID_Data.timeToApo.ValueUnitString()
+				);
+				leftHUD.AppendFormat("\nPe: {0} ETA {1}",
+					VOID_Data.oribtPeriAlt.ToSIString(),
+					VOID_Data.timeToPeri.ValueUnitString()
+				);
+				leftHUD.AppendFormat("\nTot Δv: {0} Stg Δv: {1}",
+					VOID_Data.totalDeltaV.ToSIString(2),
+					VOID_Data.stageDeltaV.ToSIString(2)
+				);
 			}
 			else
 			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
-				GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
-				GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
+				VOID_Styles.labelHud.normal.textColor = Color.red;
+				leftHUD.Append(string.Intern("-- POWER LOST --"));
 			}
+
+			GUILayout.Label(leftHUD.ToString(), VOID_Styles.labelHud, GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
 		}
 
-		public override void DrawConfigurables()
+		protected void rightHUDWindow(int id)
 		{
-			if (GUILayout.Button ("Change HUD color", GUILayout.ExpandWidth (false)))
+			StringBuilder rightHUD;
+
+			rightHUD = new StringBuilder();
+
+			VOID_Styles.labelHud.alignment = TextAnchor.UpperLeft;
+
+			if (this.core.powerAvailable)
 			{
-				++this.ColorIndex;
+				rightHUD.AppendFormat("Biome: {0} Sit: {1}",
+					VOID_Data.currBiome.ValueUnitString(),
+					VOID_Data.expSituation.ValueUnitString()
+				);
+				rightHUD.AppendFormat("\nSrf Alt: {0} Srf Vel: {1}",
+					VOID_Data.trueAltitude.ToSIString(),
+					VOID_Data.surfVelocity.ToSIString()
+				);
+				rightHUD.AppendFormat("\nVer: {0} Hor: {1}",
+					VOID_Data.vertVelocity.ToSIString(),
+					VOID_Data.horzVelocity.ToSIString()
+				);
+				rightHUD.AppendFormat("\nLat: {0} Lon: {1}",
+					VOID_Data.surfLatitude.ValueUnitString(),
+					VOID_Data.surfLongitude.ValueUnitString()
+				);
+				rightHUD.AppendFormat("\nHdg: {0} Pit: {1}",
+					VOID_Data.vesselHeading.ValueUnitString(),
+					VOID_Data.vesselPitch.ToSIString(2)
+				);
+
+				if (
+					this.core.vessel.mainBody == this.core.HomeBody &&
+					(
+						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_Styles.labelHud.normal.textColor = Color.red;
+				rightHUD.Append(string.Intern("-- POWER LOST --"));
+			}
+
+
+			GUILayout.Label(rightHUD.ToString(), VOID_Styles.labelHud, GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
 		}
 	}
 }

--- /dev/null
+++ b/VOID_HUDAdvanced.cs
@@ -1,1 +1,252 @@
-
+// VOID
+//
+// VOID_HUD.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 KerbalEngineer.VesselSimulator;
+using KSP;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public class VOID_HUDAdvanced : VOID_HUDModule, IVOID_Module
+	{
+		/*
+		 * Fields
+		 * */
+		protected VOID_HUD primaryHUD;
+
+		protected HUDWindow leftHUD;
+		protected HUDWindow rightHUD;
+
+		[AVOID_SaveValue("leftHUDPos")]
+		protected VOID_SaveValue<Rect> leftHUDPos;
+		[AVOID_SaveValue("rightHUDPos")]
+		protected VOID_SaveValue<Rect> rightHUDPos;
+
+		/*
+		 * Properties
+		 * */
+		public override int ColorIndex
+		{
+			get
+			{
+				if (this.primaryHUD != null)
+				{
+					return this.primaryHUD.ColorIndex;
+				}
+
+				return base.ColorIndex;
+			}
+			set
+			{
+				base.ColorIndex = value;
+			}
+		}
+
+		/* 
+		 * Methods
+		 * */
+		public VOID_HUDAdvanced() : base()
+		{
+			this._Name = "Advanced Heads-Up Display";
+
+			this.toggleActive = true;
+
+			this.leftHUD = new HUDWindow(this.leftHUDWindow, new Rect(
+				Screen.width * .5f - (float)GameSettings.UI_SIZE * .25f - 300f,
+				Screen.height - 200f,
+				300f, 90f)
+			);
+			this.Windows.Add(this.leftHUD);
+
+			this.leftHUDPos = this.leftHUD.WindowPos;
+
+			this.rightHUD = new HUDWindow(this.rightHUDWindow, new Rect(
+				Screen.width * .5f + (float)GameSettings.UI_SIZE * .25f,
+				Screen.height - 200f,
+				300f, 90f)
+			);
+			this.Windows.Add(this.rightHUD);
+
+			this.rightHUDPos = this.rightHUD.WindowPos;
+
+			this.positionsLocked = true;
+
+			Tools.PostDebugMessage (this, "Constructed.");
+		}
+
+		protected void leftHUDWindow(int id)
+		{
+			StringBuilder leftHUD;
+
+			leftHUD = new StringBuilder();
+
+			VOID_Styles.labelHud.alignment = TextAnchor.UpperRight;
+
+			if (this.core.powerAvailable)
+			{
+				leftHUD.AppendFormat(
+					string.Intern("Mass: {0}\n"),
+					VOID_Data.totalMass.ToSIString(2)
+				);
+
+				if (VOID_Data.vesselCrewCapacity > 0)
+				{
+					leftHUD.AppendFormat(
+						string.Intern("Crew: {0} / {1}\n"),
+						VOID_Data.vesselCrewCount.Value,
+						VOID_Data.vesselCrewCapacity.Value
+					);
+				}
+
+				leftHUD.AppendFormat(
+					string.Intern("Acc: {0} T:W: {1}\n"),
+					VOID_Data.vesselAccel.ToSIString(2),
+					VOID_Data.currThrustWeight.Value.ToString("f2")
+				);
+
+				leftHUD.AppendFormat(
+					string.Intern("Ang Vel: {0}\n"),
+					VOID_Data.vesselAngularVelocity.ToSIString(2)
+				);
+
+				if (VOID_Data.stageNominalThrust != 0d)
+				{
+					leftHUD.AppendFormat(
+						string.Intern("Thrust Offset: {0}\n"),
+						VOID_Data.vesselThrustOffset.Value.ToString("F1")
+					);
+				}
+			}
+			else
+			{
+				VOID_Styles.labelHud.normal.textColor = Color.red;
+				leftHUD.Append(string.Intern("-- POWER LOST --"));
+			}
+
+			GUILayout.Label(leftHUD.ToString(), VOID_Styles.labelHud, GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
+		}
+
+		protected void rightHUDWindow(int id)
+		{
+			StringBuilder rightHUD;
+
+			rightHUD = new StringBuilder();
+
+			VOID_Styles.labelHud.alignment = TextAnchor.UpperLeft;
+
+			if (this.core.powerAvailable)
+			{
+				rightHUD.AppendFormat(
+					"Burn Δv (Rem/Tot): {0} / {1}\n",
+					VOID_Data.currManeuverDVRemaining.ValueUnitString("f2"),
+					VOID_Data.currManeuverDeltaV.ValueUnitString("f2")
+				);
+
+				if (VOID_Data.upcomingManeuverNodes > 1)
+				{
+					rightHUD.AppendFormat("Next Burn Δv: {0}\n",
+						VOID_Data.nextManeuverDeltaV.ValueUnitString("f2")
+					);
+				}
+
+				rightHUD.AppendFormat("Burn Time (Rem/Total): {0} / {1}\n",
+					VOID_Tools.FormatInterval(VOID_Data.currentNodeBurnRemaining.Value),
+					VOID_Tools.FormatInterval(VOID_Data.currentNodeBurnDuration.Value)
+				);
+
+				if (VOID_Data.burnTimeDoneAtNode.Value != string.Empty)
+				{
+					rightHUD.AppendFormat("{0} (done @ node)\n",
+						VOID_Data.burnTimeDoneAtNode.Value
+					);
+
+					rightHUD.AppendFormat("{0} (½ done @ node)",
+						VOID_Data.burnTimeHalfDoneAtNode.Value
+					);
+				}
+				else
+				{
+					rightHUD.Append("Node is past");
+				}
+			}
+			else
+			{
+				VOID_Styles.labelHud.normal.textColor = Color.red;
+				rightHUD.Append(string.Intern("-- POWER LOST --"));
+			}
+
+			GUILayout.Label(rightHUD.ToString(), VOID_Styles.labelHud, GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
+		}
+
+		public override void DrawGUI()
+		{
+			if (this.primaryHUD == null)
+			{
+				foreach (IVOID_Module module in this.core.Modules)
+				{
+					if (module is VOID_HUD)
+					{
+						this.primaryHUD = module as VOID_HUD;
+					}
+				}
+			}
+
+			base.DrawGUI();
+
+			this.leftHUDPos.value = this.leftHUD.WindowPos;
+			this.rightHUDPos.value = this.rightHUD.WindowPos;
+		}
+
+		public override void DrawConfigurables()
+		{
+			this.positionsLocked = GUILayout.Toggle(this.positionsLocked,
+				string.Intern("Lock Advanced HUD Positions"),
+				GUILayout.ExpandWidth(false));
+		}
+	}
+}
+

file:b/VOID_HUDModule.cs (new)
--- /dev/null
+++ b/VOID_HUDModule.cs
@@ -1,1 +1,167 @@
+// VOID
+//
+// VOID_HUDModule.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 KerbalEngineer.VesselSimulator;
+using KSP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public abstract class VOID_HUDModule : VOID_Module
+	{
+		[AVOID_SaveValue("colorIndex")]
+		protected VOID_SaveValue<int> _colorIndex;
+
+		protected List<Color> textColors;
+
+		[AVOID_SaveValue("positionsLocked")]
+		protected VOID_SaveValue<bool> positionsLocked;
+
+		public virtual int ColorIndex
+		{
+			get
+			{
+				return this._colorIndex;
+			}
+			set
+			{
+				if (this._colorIndex >= this.textColors.Count - 1)
+				{
+					this._colorIndex = 0;
+					return;
+				}
+
+				this._colorIndex = value;
+			}
+		}
+
+		public virtual List<HUDWindow> Windows
+		{
+			get;
+			protected set;
+		}
+
+		public VOID_HUDModule() : base()
+		{
+			this._colorIndex = 0;
+
+			this.textColors = new List<Color>();
+
+			this.textColors.Add(Color.green);
+			this.textColors.Add(Color.black);
+			this.textColors.Add(Color.white);
+			this.textColors.Add(Color.red);
+			this.textColors.Add(Color.blue);
+			this.textColors.Add(Color.yellow);
+			this.textColors.Add(Color.gray);
+			this.textColors.Add(Color.cyan);
+			this.textColors.Add(Color.magenta);
+
+			this.positionsLocked = true;
+
+			this.Windows = new List<HUDWindow>();
+		}
+
+		public override void DrawGUI()
+		{
+			VOID_Styles.labelHud.normal.textColor = textColors [ColorIndex];
+
+			GUI.skin = this.core.Skin;
+
+			if (HighLogic.LoadedSceneIsEditor ||
+				(TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate)
+			)
+			{
+				SimManager.RequestSimulation();
+			}
+
+			foreach (HUDWindow window in this.Windows)
+			{
+				window.WindowPos = GUI.Window(
+					this.core.windowID,
+					window.WindowPos,
+					VOID_Tools.GetWindowHandler(window.WindowFunction),
+					GUIContent.none,
+					GUIStyle.none
+				);
+			}
+		}
+
+		public override void DrawConfigurables()
+		{
+			if (GUILayout.Button (string.Intern("Change HUD color"), GUILayout.ExpandWidth (false)))
+			{
+				++this.ColorIndex;
+			}
+
+			if (GUILayout.Button(string.Intern("Reset HUD Positions"), GUILayout.ExpandWidth(false)))
+			{
+				foreach (HUDWindow window in this.Windows)
+				{
+					window.WindowPos = new Rect(window.defaultWindowPos);
+				}
+			}
+
+			this.positionsLocked = GUILayout.Toggle(this.positionsLocked,
+				string.Intern("Lock HUD Positions"),
+				GUILayout.ExpandWidth(false));
+		}
+	}
+
+	public class HUDWindow
+	{
+		public readonly Rect defaultWindowPos;
+
+		public Action<int> WindowFunction
+		{
+			get;
+			private set;
+		}
+
+		public Rect WindowPos
+		{
+			get;
+			set;
+		}
+
+		private HUDWindow() {}
+
+		public HUDWindow(Action<int> windowFunc, Rect defaultPos)
+		{
+			this.WindowFunction = windowFunc;
+			this.defaultWindowPos = defaultPos;
+			this.WindowPos = new Rect(this.defaultWindowPos);
+		}
+	}
+}
+
+

--- /dev/null
+++ b/VOID_Localization.cs
@@ -1,1 +1,36 @@
+// VOID
+//
+// VOID_Localization.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.
 
+public static class VOID_Localization
+{
+	public static string void_primary = "Primary";
+	public static string void_altitude_asl = "Altitude (ASL)";
+	public static string void_velocity = "Velocity";
+	public static string void_apoapsis = "Apoapsis";
+	public static string void_periapsis = "Periapsis";
+}

--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -1,27 +1,36 @@
-//
-//  VOID_Module.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// VOID
+//
+// VOID_Module.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 System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -42,6 +51,19 @@
 		/*
 		 * Properties
 		 * */
+		protected virtual VOID_Core core
+		{
+			get
+			{
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					return VOID_EditorCore.Instance as VOID_Core;
+				}
+
+				return VOID_Core.Instance;
+			}
+		}
+
 		public virtual bool toggleActive
 		{
 			get
@@ -193,68 +215,93 @@
 	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;
-
-		public virtual void ModuleWindow(int _)
-		{
-			if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
-				foreach (var fieldinfo in this.GetType().GetFields(
-					BindingFlags.Instance |
-					BindingFlags.NonPublic |
-					BindingFlags.Public |
-					BindingFlags.FlattenHierarchy
-				))
-				{
-					object field = null;
-
-					try
-					{
-						field = fieldinfo.GetValue (this);
-					}
-					catch (NullReferenceException) {
-						Tools.PostDebugMessage(string.Format(
-							"{0}: caught NullReferenceException, could not get value for field {1}.",
-							this.GetType().Name,
-							fieldinfo.Name
-						));
-					}
-
-					if (field == null) {
-						continue;
-					}
-
-					if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
-						(field as IVOID_DataValue).Refresh ();
-					}
-				}
-
-				this.lastUpdate = VOID_Core.Instance.updateTimer;
-			}
-		}
+		protected Rect WindowPos;
+		protected float defWidth;
+		protected float defHeight;
+
+		protected string inputLockName;
+
+		public VOID_WindowModule() : base()
+		{
+			this.defWidth = 250f;
+			this.defHeight = 50f;
+
+			this.inputLockName = string.Concat(this.Name, "_edlock");
+
+			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)
 			);
 
-			_Pos = Tools.ClampRectToScreen (_Pos);
+			bool cursorInWindow = _Pos.Contains(Mouse.screenPos);
+
+			switch (HighLogic.LoadedScene)
+			{
+				case GameScenes.EDITOR:
+					if (cursorInWindow)
+					{
+						InputLockManager.SetControlLock(
+							ControlTypes.EDITOR_ICON_HOVER | ControlTypes.EDITOR_ICON_PICK |
+							ControlTypes.EDITOR_PAD_PICK_COPY | ControlTypes.EDITOR_PAD_PICK_COPY,
+							this.inputLockName
+						);
+						EditorLogic.fetch.Lock(false, false, false, this.inputLockName);
+					}
+					else
+					{
+						EditorLogic.fetch.Unlock(this.inputLockName);
+					}
+					break;
+				case GameScenes.FLIGHT:
+					if (cursorInWindow)
+					{
+						InputLockManager.SetControlLock(ControlTypes.CAMERACONTROLS, this.inputLockName);
+					}
+					else if (InputLockManager.GetControlLock(this.inputLockName) != ControlTypes.None)
+					{
+						InputLockManager.RemoveControlLock(this.inputLockName);
+					}
+					break;
+				case GameScenes.SPACECENTER:
+					if (cursorInWindow)
+					{
+						InputLockManager.SetControlLock(ControlTypes.KSC_FACILITIES, this.inputLockName);
+					}
+					else if (InputLockManager.GetControlLock(this.inputLockName) != ControlTypes.None)
+					{
+						InputLockManager.RemoveControlLock(this.inputLockName);
+					}
+					break;
+			}
+
+			if (HighLogic.LoadedSceneIsEditor)
+			{
+				_Pos = Tools.ClampRectToEditorPad(_Pos);
+			}
+			else
+			{
+				_Pos = Tools.ClampRectToScreen(_Pos);
+			}
 
 			if (_Pos != this.WindowPos)
 			{
 				this.WindowPos = _Pos;
-				VOID_Core.Instance.configDirty = true;
+				this.core.configDirty = true;
 			}
 		}
 	}

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -1,25 +1,34 @@
+// VOID
 //
-//  VOID_Orbital.cs
+// VOID_Orbital.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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 ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -33,117 +42,6 @@
 		protected long _precisionValues = 230584300921369395;
 		protected IntCollection precisionValues;
 
-		protected VOID_StrValue primaryName = new VOID_StrValue (
-			VOIDLabels.void_primary,
-			new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
-		);
-
-		protected VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
-			"Altitude (ASL)",
-			new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
-			"m"
-		);
-
-		protected VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
-			VOIDLabels.void_velocity,
-			new Func<double> (() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
-			"m/s"
-		);
-
-		protected VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
-			VOIDLabels.void_apoapsis,
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
-			"m"
-		);
-
-		protected VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
-			VOIDLabels.void_periapsis,
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
-			"m"
-		);
-
-		protected VOID_StrValue timeToApo = new VOID_StrValue(
-		"Time to Apoapsis",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
-		);
-
-		protected VOID_StrValue timeToPeri = new VOID_StrValue(
-			"Time to Periapsis",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
-		);
-
-		protected VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
-			"Inclination",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
-			"°"
-		);
-
-		protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
-			"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) /
-				Math.Pow(orbitRadius, 2);
-			},
-			"m/s²"
-		);
-
-		protected VOID_StrValue orbitPeriod = new VOID_StrValue(
-			"Period",
-			 new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
-		);
-
-		protected VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
-			"Semi-Major Axis",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
-			"m"
-		);
-
-		protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
-			"Eccentricity",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
-			""
-		);
-
-		protected VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
-			"Mean Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
-			"°"
-		);
-
-		protected VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
-			"True Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
-			"°"
-		);
-
-		protected VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
-		"Eccentric Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
-			"°"
-		);
-
-		protected VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
-			"Long. Ascending Node",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
-			"°"
-		);
-
-		protected VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
-			"Argument of Periapsis",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
-			"°"
-	    );
-
-		protected VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
-			"Local Sidereal Longitude",
-			new Func<double>(() => Tools.FixDegreeDomain(
-				VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
-			"°"
-		);
-
 		public VOID_Orbital()
 		{
 			this._Name = "Orbital Information";
@@ -154,57 +52,55 @@
 
 		public override void ModuleWindow(int _)
 		{
-			base.ModuleWindow (_);
-
 			int idx = 0;
 
             GUILayout.BeginVertical();
 
-			this.primaryName.DoGUIHorizontal ();
+			VOID_Data.primaryName.DoGUIHorizontal ();
 
-			this.precisionValues [idx]= (ushort)this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.precisionValues [idx]= (ushort)this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.precisionValues [idx]= (ushort)this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.timeToApo.DoGUIHorizontal();
+			VOID_Data.timeToApo.DoGUIHorizontal();
 
-			this.precisionValues [idx]= (ushort)this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.timeToPeri.DoGUIHorizontal();
+			VOID_Data.timeToPeri.DoGUIHorizontal();
 
-			this.orbitInclination.DoGUIHorizontal("F3");
+			VOID_Data.orbitInclination.DoGUIHorizontal("F3");
 
-			this.precisionValues [idx]= (ushort)this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
 			this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
 
 			if (this.toggleExtended)
             {
-				this.orbitPeriod.DoGUIHorizontal();
+				VOID_Data.orbitPeriod.DoGUIHorizontal();
 
-				this.precisionValues [idx]= (ushort)this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
+				this.precisionValues [idx]= (ushort)VOID_Data.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
 				idx++;
 
-				this.eccentricity.DoGUIHorizontal("F4");
+				VOID_Data.eccentricity.DoGUIHorizontal("F4");
 
-				this.meanAnomaly.DoGUIHorizontal("F3");
+				VOID_Data.meanAnomaly.DoGUIHorizontal("F3");
 
-				this.trueAnomaly.DoGUIHorizontal("F3");
+				VOID_Data.trueAnomaly.DoGUIHorizontal("F3");
 
-				this.eccAnomaly.DoGUIHorizontal("F3");
+				VOID_Data.eccAnomaly.DoGUIHorizontal("F3");
 
-				this.longitudeAscNode.DoGUIHorizontal("F3");
+				VOID_Data.longitudeAscNode.DoGUIHorizontal("F3");
 
-				this.argumentPeriapsis.DoGUIHorizontal("F3");
+				VOID_Data.argumentPeriapsis.DoGUIHorizontal("F3");
 
-				this.localSiderealLongitude.DoGUIHorizontal("F3");
+				VOID_Data.localSiderealLongitude.DoGUIHorizontal("F3");
             }
 
             GUILayout.EndVertical();

--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -1,27 +1,36 @@
-//
-//  VOID_Orbital.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  Copyright (c) 2013 toadicus
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// VOID
+//
+// VOID_Rendezvous.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.Collections.Generic;
 using System.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -49,23 +58,26 @@
 			Vessel rendezvessel = new Vessel();
 			CelestialBody rendezbody = new CelestialBody();
 
-			this.RegisterModule = VOID_Core.Instance.Modules.Where(m => typeof(VOID_VesselRegister).IsAssignableFrom(m.GetType())).FirstOrDefault() as VOID_VesselRegister;
+			if (this.RegisterModule == null)
+			{
+				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:", VOID_Styles.labelCenterBold);
 			if (FlightGlobals.fetch.VesselTarget != null)
 			{
 				//a KSP Target (body or vessel) is selected
-				if (FlightGlobals.fetch.vesselTargetMode == FlightGlobals.VesselTargetModes.Direction)
+				if (FlightGlobals.fetch.vesselTargetMode == VesselTargetModes.Direction)
 				{
 					//a Body is selected
 					rendezbody = vessel.patchedConicSolver.targetBody;
 					display_rendezvous_info(null, rendezbody);
 				}
-				else if (FlightGlobals.fetch.vesselTargetMode == FlightGlobals.VesselTargetModes.DirectionAndVelocity)
+				else if (FlightGlobals.fetch.vesselTargetMode == VesselTargetModes.DirectionAndVelocity)
 				{
 					//a Vessel is selected
 					rendezvessel = FlightGlobals.fetch.VesselTarget.GetVessel();
@@ -82,13 +94,13 @@
 			else
 			{
 				//no KSP Target selected
-				GUILayout.Label("No Target Selected", VOID_Core.Instance.LabelStyles["center_bold"]);
+				GUILayout.Label("No Target Selected", VOID_Styles.labelCenterBold);
 			}
 
 			//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:", VOID_Styles.labelCenterBold);
 				if (this.RegisterModule.selectedVessel != null)
 				{
 					rendezvessel = this.RegisterModule.selectedVessel;
@@ -110,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", VOID_Styles.labelCenterBold);
 				}
 			}
 
@@ -118,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();
@@ -131,15 +143,15 @@
 			{
 				//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, VOID_Styles.labelCenterBold, 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)
 				{
 					// Toadicus edit: added local sidereal longitude.
 					// Toadicus edit: added local sidereal longitude.
-					double LSL = vessel.longitude + vessel.orbit.referenceBody.rotationAngle;
-					LSL = Tools.FixDegreeDomain (LSL);
+					double LSL = v.longitude + v.orbit.referenceBody.rotationAngle;
+					LSL = VOID_Tools.FixDegreeDomain (LSL);
 
 					//display orbital info for orbiting/flying/suborbital/escaping vessels only
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -181,13 +193,19 @@
 					GUILayout.Label(Tools.MuMech_ToSI((vessel.findWorldCenterOfMass() - v.findWorldCenterOfMass()).magnitude) + "m", GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
-					//target_vessel_extended_orbital_info = GUILayout.Toggle(target_vessel_extended_orbital_info, "Extended info");
+					// Toadicus edit: added local sidereal longitude.
+					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+					GUILayout.Label("Local Sidereal Longitude:");
+					GUILayout.Label(LSL.ToString("F3") + "°", VOID_Styles.labelRight);
+					GUILayout.EndHorizontal();
+
+					toggleExtendedOrbital.value = GUILayout.Toggle(toggleExtendedOrbital, "Extended info");
 
 					if (toggleExtendedOrbital)
 					{
 						GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 						GUILayout.Label("Period:");
-						GUILayout.Label(Tools.ConvertInterval(v.orbit.period), GUILayout.ExpandWidth(false));
+						GUILayout.Label(VOID_Tools.FormatInterval(v.orbit.period), GUILayout.ExpandWidth(false));
 						GUILayout.EndHorizontal();
 
 						GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -226,24 +244,18 @@
 						GUILayout.Label("Arg. of periapsis:");
 						GUILayout.Label(v.orbit.argumentOfPeriapsis.ToString("F3") + "°", GUILayout.ExpandWidth(false));
 						GUILayout.EndHorizontal();
-
-						// 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.EndHorizontal();
 					}
 				}
 				else
 				{
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 					GUILayout.Label("Latitude:");
-					GUILayout.Label(Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
+					GUILayout.Label(VOID_Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 					GUILayout.Label("Longitude:");
-					GUILayout.Label(Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
+					GUILayout.Label(VOID_Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -255,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, VOID_Styles.labelCenterBold);
 
 				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 				GUILayout.Label("Ap/Pe:");
@@ -288,28 +300,28 @@
 				//SUN2PLANET:
 				if (vessel.mainBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
 				{
-					Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
+					VOID_Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] SUN2PLANET OK");
 				}
 
 				//PLANET2PLANET
 				else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
 				{
-					Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
+					VOID_Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] PLANET2PLANET OK");
 				}
 
 				//PLANET2MOON
 				else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
 				{
-					Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
+					VOID_Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] PLANET2MOON OK");
 				}
 
 				//MOON2MOON
 				else if (vessel.mainBody.referenceBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
 				{
-					Tools.display_transfer_angles_MOON2MOON(cb, vessel);
+					VOID_Tools.display_transfer_angles_MOON2MOON(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] MOON2MOON OK");
 				}
 

--- a/VOID_SaveValue.cs
+++ b/VOID_SaveValue.cs
@@ -1,26 +1,35 @@
+// VOID
 //
-//  VOID_Config.cs
+// VOID_SaveValue.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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.Collections.Generic;
-using KSP;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID

file:b/VOID_StageInfo.cs (new)
--- /dev/null
+++ b/VOID_StageInfo.cs
@@ -1,1 +1,218 @@
-
+// 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 KerbalEngineer.VesselSimulator;
+using KSP;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public class VOID_StageInfo : VOID_WindowModule
+	{
+		private Table stageTable;
+
+		private Table.Column<int> stageNumberCol;
+		private Table.Column<double> stageDeltaVCol;
+		private Table.Column<double> stageTotalDVCol;
+		private Table.Column<double> stageInvertDVCol;
+		private Table.Column<double> stageMassCol;
+		private Table.Column<double> stageTotalMassCol;
+		private Table.Column<double> stageThrustCol;
+		private Table.Column<double> stageTWRCol;
+
+		private bool stylesApplied;
+		private bool showBodyList;
+
+		private Rect bodyListPos;
+
+		private CelestialBody selectedBody;
+		[AVOID_SaveValue("bodyIdx")]
+		private VOID_SaveValue<int> bodyIdx;
+		private int lastIdx;
+
+		public VOID_StageInfo() : base()
+		{
+			this._Name = "Stage Information";
+			this.defWidth = 200f;
+			this.bodyIdx = 4;
+
+			this.stylesApplied = false;
+			this.showBodyList = false;
+
+			this.bodyListPos = new Rect();
+
+			this.stageTable = new Table();
+
+			this.stageNumberCol = new Table.Column<int>("Stage", 40f);
+			this.stageTable.Add(this.stageNumberCol);
+
+			this.stageDeltaVCol = new Table.Column<double>("DeltaV [m/s]", 60f);
+			this.stageDeltaVCol.Format = "S2";
+			this.stageTable.Add(this.stageDeltaVCol);
+
+			this.stageTotalDVCol = new Table.Column<double>("Total ΔV [m/s]", 60f);
+			this.stageTotalDVCol.Format = "S2";
+			this.stageTable.Add(this.stageTotalDVCol);
+
+			this.stageInvertDVCol = new Table.Column<double>("Invert ΔV [m/s]", 60f);
+			this.stageInvertDVCol.Format = "S2";
+			this.stageTable.Add(this.stageInvertDVCol);
+
+			this.stageMassCol = new Table.Column<double>("Mass [Mg]", 60f);
+			this.stageMassCol.Format = "#.#";
+			this.stageTable.Add(this.stageMassCol);
+
+			this.stageTotalMassCol = new Table.Column<double>("Total [Mg]", 60f);
+			this.stageTotalMassCol.Format = "#.#";
+			this.stageTable.Add(this.stageTotalMassCol);
+
+			this.stageThrustCol = new Table.Column<double>("Thrust [N]", 60f);
+			this.stageThrustCol.Format = "S2";
+			this.stageTable.Add(this.stageThrustCol);
+
+			this.stageTWRCol = new Table.Column<double>("T/W Ratio", 60f);
+			this.stageTWRCol.Format = "#.#";
+			this.stageTable.Add(this.stageTWRCol);
+		}
+
+		public override void DrawGUI()
+		{
+			base.DrawGUI();
+
+			if (this.showBodyList)
+			{
+				GUILayout.Window(core.windowID, this.bodyListPos, this.BodyPickerWindow, string.Empty);
+			}
+		}
+
+		public override void ModuleWindow(int _)
+		{
+			if (
+				HighLogic.LoadedSceneIsEditor ||
+				(TimeWarp.WarpMode == TimeWarp.Modes.LOW) ||
+				(TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate)
+			)
+			{
+				KerbalEngineer.VesselSimulator.SimManager.RequestSimulation();
+			}
+
+			if (!this.stylesApplied)
+			{
+				this.stageTable.ApplyCellStyle(VOID_Styles.labelCenter);
+				this.stageTable.ApplyHeaderStyle(VOID_Styles.labelCenterBold);
+			}
+
+			this.stageTable.ClearColumns();
+
+			if (core.Stages == null || core.Stages.Length == 0)
+			{
+				GUILayout.BeginVertical();
+
+				GUILayout.Label("No stage data!");
+
+				GUILayout.EndVertical();
+
+				return;
+			}
+
+			foreach (Stage stage in core.Stages)
+			{
+				if (stage.deltaV == 0 && stage.mass == 0)
+				{
+					continue;
+				}
+
+				this.stageNumberCol.Add(stage.number);
+
+				this.stageDeltaVCol.Add(stage.deltaV);
+				this.stageTotalDVCol.Add(stage.totalDeltaV);
+				this.stageInvertDVCol.Add(stage.inverseTotalDeltaV);
+
+				this.stageMassCol.Add(stage.mass);
+				this.stageTotalMassCol.Add(stage.totalMass);      
+
+				this.stageThrustCol.Add(stage.thrust * 1000f);
+				this.stageTWRCol.Add(stage.thrustToWeight / (this.selectedBody ?? core.HomeBody).GeeASL);
+			}
+
+			this.stageTable.Render();
+
+			if (core.sortedBodyList != null)
+			{
+				GUILayout.BeginHorizontal();
+
+				if (GUILayout.Button("◄"))
+				{
+					this.bodyIdx--;
+				}
+
+				this.showBodyList = GUILayout.Toggle(this.showBodyList, (this.selectedBody ?? core.HomeBody).bodyName, GUI.skin.button);
+				Rect bodyButtonPos = GUILayoutUtility.GetLastRect();
+
+				if (Event.current.type == EventType.Repaint)
+				{
+					this.bodyListPos.width = bodyButtonPos.width;
+					this.bodyListPos.x = bodyButtonPos.xMin + this.WindowPos.xMin;
+					this.bodyListPos.y = bodyButtonPos.yMax + this.WindowPos.yMin;
+				}
+
+				if (GUILayout.Button("►"))
+				{
+					this.bodyIdx++;
+				}
+
+				this.bodyIdx %= core.sortedBodyList.Count;
+
+				if (this.bodyIdx < 0)
+				{
+					this.bodyIdx += core.sortedBodyList.Count;
+				}
+
+				if (this.lastIdx != this.bodyIdx)
+				{
+					this.lastIdx = this.bodyIdx;
+					this.selectedBody = core.sortedBodyList[this.bodyIdx];
+				}
+
+				GUILayout.EndHorizontal();
+			}
+
+			GUILayout.BeginHorizontal();
+
+			if (
+				GUILayout.Button("Engineering data powered by <i>VesselSimulator from KER</i>.",
+					VOID_Styles.labelLink)
+			)
+			{
+				Application.OpenURL("http://forum.kerbalspaceprogram.com/threads/18230");
+			}
+
+			GUILayout.EndHorizontal();
+
+			GUI.DragWindow();
+		}
+
+		private void BodyPickerWindow(int _)
+		{
+			foreach (CelestialBody body in core.sortedBodyList)
+			{
+				if (GUILayout.Button(body.bodyName, VOID_Styles.labelDefault))
+				{
+					Debug.Log("Picked new body focus: " + body.bodyName);
+					this.bodyIdx = core.sortedBodyList.IndexOf(body);
+					this.showBodyList = false;
+				}
+			}
+		}
+	}
+
+	public class VOID_StageInfoEditor : VOID_StageInfo, IVOID_EditorModule {}
+}
+
+

file:b/VOID_Styles.cs (new)
--- /dev/null
+++ b/VOID_Styles.cs
@@ -1,1 +1,129 @@
+// VOID
+//
+// 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 System;
+using UnityEngine;
+
+namespace VOID
+{
+	public static class VOID_Styles
+	{
+		public static bool Ready
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelDefault
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelLink
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelCenter
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelCenterBold
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelGreen
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelHud
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelRight
+		{
+			get;
+			private set;
+		}
+
+		public static GUIStyle labelRed
+		{
+			get;
+			private set;
+		}
+
+		public static void OnSkinChanged()
+		{
+			labelDefault = new GUIStyle(GUI.skin.label);
+
+			labelLink = new GUIStyle(GUI.skin.label);
+			labelLink.fontStyle = FontStyle.Italic;
+			labelLink.fontSize = (int)((float)labelLink.fontSize * .8f);
+
+			labelCenter = new GUIStyle(GUI.skin.label);
+			labelCenter.normal.textColor = Color.white;
+			labelCenter.alignment = TextAnchor.UpperCenter;
+
+			labelCenterBold = new GUIStyle(GUI.skin.label);
+			labelCenterBold.normal.textColor = Color.white;
+			labelCenterBold.alignment = TextAnchor.UpperCenter;
+			labelCenterBold.fontStyle = FontStyle.Bold;
+
+			labelHud = new GUIStyle(labelDefault);
+
+			labelRight = new GUIStyle(GUI.skin.label);
+			labelRight.normal.textColor = Color.white;
+			labelRight.alignment = TextAnchor.UpperRight;
+
+			labelRed = new GUIStyle(GUI.skin.label);
+			labelRed.normal.textColor = Color.red;
+
+			labelGreen = new GUIStyle(GUI.skin.label);
+			labelGreen.normal.textColor = Color.green;
+
+			Ready = true;
+		}
+
+		static VOID_Styles()
+		{
+			Ready = false;
+		}
+	}
+}
+
+

--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -1,25 +1,34 @@
+// VOID
 //
-//  VOID_Orbital.cs
+// VOID_SurfAtmo.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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 ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -29,98 +38,6 @@
 		[AVOID_SaveValue("precisionValues")]
 		protected long _precisionValues = 230584300921369395;
 		protected IntCollection precisionValues;
-
-		protected VOID_DoubleValue trueAltitude = new VOID_DoubleValue(
-			"Altitude (true)",
-			delegate()
-			{
-				double alt_true = VOID_Core.Instance.vessel.orbit.altitude - VOID_Core.Instance.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;
-				return alt_true;
-			},
-			"m"
-		);
-
-		protected VOID_StrValue surfLatitude = new VOID_StrValue(
-			"Latitude",
-			new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
-		);
-
-		protected VOID_StrValue surfLongitude = new VOID_StrValue(
-			"Longitude",
-			new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
-		);
-
-		protected VOID_StrValue vesselHeading = new VOID_StrValue(
-			"Heading",
-			delegate()
-			{
-				double heading = Tools.MuMech_get_heading(VOID_Core.Instance.vessel);
-				string cardinal = Tools.get_heading_text(heading);
-
-				return string.Format(
-					"{0}° {1}",
-					heading.ToString("F2"),
-					cardinal
-				);
-			}
-		);
-
-		protected VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
-			"Terrain elevation",
-			new Func<double> (() => VOID_Core.Instance.vessel.terrainAltitude),
-			"m"
-		);
-
-		protected VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
-			"Surface velocity",
-			new Func<double> (() => VOID_Core.Instance.vessel.srf_velocity.magnitude),
-			"m/s"
-		);
-
-		protected VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
-			"Vertical speed",
-			new Func<double> (() => VOID_Core.Instance.vessel.verticalSpeed),
-			"m/s"
-		);
-
-		protected VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
-			"Horizontal speed",
-			new Func<double> (() => VOID_Core.Instance.vessel.horizontalSrfSpeed),
-			"m/s"
-		);
-
-		protected VOID_FloatValue temperature = new VOID_FloatValue(
-			"Temperature",
-			new Func<float> (() => VOID_Core.Instance.vessel.flightIntegrator.getExternalTemperature()),
-			"°C"
-		);
-
-		protected VOID_DoubleValue atmDensity = new VOID_DoubleValue (
-			"Atmosphere Density",
-			new Func<double> (() => VOID_Core.Instance.vessel.atmDensity * 1000f),
-			"g/m³"
-		);
-
-		protected VOID_DoubleValue atmPressure = new VOID_DoubleValue (
-			"Pressure",
-			new Func<double> (() => VOID_Core.Instance.vessel.staticPressure),
-			"atm"
-		);
-
-		protected VOID_FloatValue atmLimit = new VOID_FloatValue(
-			"Atmosphere Limit",
-			new Func<float> (() => VOID_Core.Instance.vessel.mainBody.maxAtmosphereAltitude),
-			"m"
-		);
-
-		protected VOID_StrValue currBiome = new VOID_StrValue(
-			"Biome",
-			new Func<string> (() => Tools.Toadicus_GetAtt(VOID_Core.Instance.vessel).name)
-		);
 
 		public VOID_SurfAtmo()
 		{
@@ -132,44 +49,46 @@
 
 		public override void ModuleWindow(int _)
 		{
-			base.ModuleWindow (_);
-
 			int idx = 0;
 
 			GUILayout.BeginVertical();
 
-			this.precisionValues [idx]= (ushort)this.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.surfLatitude.DoGUIHorizontal ();
+			VOID_Data.surfLatitude.DoGUIHorizontal ();
 
-			this.surfLongitude.DoGUIHorizontal ();
+			VOID_Data.surfLongitude.DoGUIHorizontal ();
 
-			this.vesselHeading.DoGUIHorizontal ();
+			VOID_Data.vesselHeading.DoGUIHorizontal ();
 
-			this.precisionValues [idx]= (ushort)this.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.precisionValues [idx]= (ushort)this.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues[idx] = (ushort)VOID_Data.downrangeDistance.DoGUIHorizontal(this.precisionValues[idx]);
 			idx++;
 
-			this.precisionValues [idx]= (ushort)this.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.precisionValues [idx]= (ushort)this.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			this.precisionValues [idx]= (ushort)VOID_Data.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.temperature.DoGUIHorizontal ("F2");
+			this.precisionValues [idx]= (ushort)VOID_Data.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
 
-			this.atmDensity.DoGUIHorizontal (3);
+			VOID_Data.temperature.DoGUIHorizontal ("F2");
 
-			this.atmPressure.DoGUIHorizontal ("F2");
+			this.precisionValues [idx]= (ushort)VOID_Data.atmDensity.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
 
-			this.precisionValues [idx]= (ushort)this.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
+			VOID_Data.atmPressure.DoGUIHorizontal ("F2");
+
+			this.precisionValues [idx]= (ushort)VOID_Data.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
 			// Toadicus edit: added Biome
-			this.currBiome.DoGUIHorizontal ();
+			VOID_Data.currBiome.DoGUIHorizontal ();
 
 			GUILayout.EndVertical();
 			GUI.DragWindow();

file:b/VOID_TWR.cs (new)
--- /dev/null
+++ b/VOID_TWR.cs
@@ -1,1 +1,69 @@
+// 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
+	{
+		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)
+			)
+			{
+				KerbalEngineer.VesselSimulator.SimManager.RequestSimulation();
+			}
+
+			GUILayout.BeginVertical();
+
+			if (core.sortedBodyList == null)
+			{
+				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+				GUILayout.Label("Unavailable");
+
+				GUILayout.EndHorizontal();
+			}
+			else
+			{
+				foreach (CelestialBody body in core.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 {}
+}
+
+

file:b/VOID_Tools.cs (new)
--- /dev/null
+++ b/VOID_Tools.cs
@@ -1,1 +1,1055 @@
-
+// VOID
+//
+// VOID_Tools.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.Collections.Generic;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public static partial class VOID_Tools
+	{
+		#region CelestialBody Utilities
+		public static bool hasAncestor(this CelestialBody bodyA, CelestialBody bodyB)
+		{
+			if (bodyA == null || bodyB == null)
+			{
+				return false;
+			}
+
+			while (bodyA.orbitDriver != null)
+			{
+				if (bodyA.orbit.referenceBody == bodyB)
+				{
+					return true;
+				}
+
+				bodyA = bodyA.orbit.referenceBody;
+			} 
+
+			return false;
+		}
+
+		public static bool NearestRelatedParents(ref CelestialBody bodyA, ref CelestialBody bodyB)
+		{
+			if (bodyA == null || bodyB == null || bodyA.orbitDriver == null || bodyB.orbitDriver == null)
+			{
+				throw new ArgumentException(string.Concat(
+					"CelestialBody::FindRelatedParents: ",
+					"Neither body may be null, and both bodies must have orbits."
+				));
+			}
+
+			CelestialBody a, b;
+
+			a = bodyA;
+
+			while (bodyA.orbitDriver != null)
+			{
+				b = bodyB;
+
+				while (b.orbitDriver != null)
+				{
+					if (a.orbit.referenceBody == b.orbit.referenceBody)
+					{
+						bodyA = a;
+						bodyB = b;
+						return true;
+					}
+
+					b = b.orbit.referenceBody;
+				}
+
+				a = a.orbit.referenceBody;
+			}
+
+			return false;
+		}
+		#endregion
+
+		#region VESSEL_EXTENSIONS_SCIENCE
+		public static CBAttributeMapSO.MapAttribute GetBiome(this Vessel vessel)
+		{
+			CBAttributeMapSO.MapAttribute mapAttribute;
+
+			try
+			{
+				CBAttributeMapSO BiomeMap = vessel.mainBody.BiomeMap;
+
+				double lat = vessel.latitude * Math.PI / 180d;
+				double lon = vessel.longitude * Math.PI / 180d;
+
+				mapAttribute = BiomeMap.GetAtt(lat, lon);
+
+				/*
+				lon -= Math.PI / 2d;
+
+				if (lon < 0d)
+				{
+					lon += 2d * Math.PI;
+				}
+
+				float v = (float)(lat / Math.PI) + 0.5f;
+				float u = (float)(lon / (2d * Math.PI));
+
+				Color pixelBilinear = BiomeMap.Map.GetPixelBilinear(u, v);
+				mapAttribute = BiomeMap.defaultAttribute;
+
+				if (BiomeMap.Map != null)
+				{
+					if (BiomeMap.exactSearch)
+					{
+						for (int i = 0; i < BiomeMap.Attributes.Length; ++i)
+						{
+							if (pixelBilinear == BiomeMap.Attributes[i].mapColor)
+							{
+								mapAttribute = BiomeMap.Attributes[i];
+							}
+						}
+					}
+					else
+					{
+						float zero = 0;
+						float num = 1 / zero;
+						for (int j = 0; j < BiomeMap.Attributes.Length; ++j)
+						{
+							Color mapColor = BiomeMap.Attributes[j].mapColor;
+							float sqrMagnitude = ((Vector4)(mapColor - pixelBilinear)).sqrMagnitude;
+							if (sqrMagnitude < num)
+							{
+								bool testCase = true;
+								if (BiomeMap.nonExactThreshold != -1)
+								{
+									testCase = (sqrMagnitude < BiomeMap.nonExactThreshold);
+								}
+								if (testCase)
+								{
+									mapAttribute = BiomeMap.Attributes[j];
+									num = sqrMagnitude;
+								}
+							}
+						}
+					}
+				}
+				*/
+			}
+			catch (NullReferenceException)
+			{
+				mapAttribute = new CBAttributeMapSO.MapAttribute();
+				mapAttribute.name = "N/A";
+			}
+
+			return mapAttribute;
+		}
+
+		public static ExperimentSituations GetExperimentSituation(this Vessel vessel)
+		{
+			if (vessel == null)
+			{
+				return ExperimentSituations.SrfSplashed;
+			}
+
+			Vessel.Situations situation = vessel.situation;
+
+			switch (situation)
+			{
+				case Vessel.Situations.PRELAUNCH:
+				case Vessel.Situations.LANDED:
+					return ExperimentSituations.SrfLanded;
+				case Vessel.Situations.SPLASHED:
+					return ExperimentSituations.SrfSplashed;
+				case Vessel.Situations.FLYING:
+					if (vessel.altitude < (double)vessel.mainBody.scienceValues.flyingAltitudeThreshold)
+					{
+						return ExperimentSituations.FlyingLow;
+					}
+					else
+					{
+						return ExperimentSituations.FlyingHigh;
+					}
+			}
+
+			if (vessel.altitude < (double)vessel.mainBody.scienceValues.spaceAltitudeThreshold)
+			{
+				return ExperimentSituations.InSpaceLow;
+			}
+			else
+			{
+				return ExperimentSituations.InSpaceHigh;
+			}
+		}
+
+		public static string HumanString(this ExperimentSituations situation)
+		{
+			switch (situation)
+			{
+				case ExperimentSituations.FlyingHigh:
+					return "Upper Atmosphere";
+				case ExperimentSituations.FlyingLow:
+					return "Flying";
+				case ExperimentSituations.SrfLanded:
+					return "Surface";
+				case ExperimentSituations.InSpaceLow:
+					return "Near in Space";
+				case ExperimentSituations.InSpaceHigh:
+					return "High in Space";
+				case ExperimentSituations.SrfSplashed:
+					return "Splashed Down";
+				default:
+					return "Unknown";
+			}
+		}
+		#endregion
+
+		#region VESSEL_EXTENSIONS_LAT_LONG
+		public static string GetLongitudeString(this Vessel vessel, string format = "F4")
+		{
+			string dir_long = "W";
+			double v_long = vessel.longitude;
+
+			v_long = FixDegreeDomain(v_long);
+
+			if (v_long < -180d)
+			{
+				v_long += 360d;
+			}
+			if (v_long >= 180)
+			{
+				v_long -= 360d;
+			}
+
+			if (v_long > 0)
+				dir_long = "E";
+
+			return string.Format("{0}° {1}", Math.Abs(v_long).ToString(format), dir_long);
+		}
+
+		public static string GetLatitudeString(this Vessel vessel, string format = "F4")
+		{
+			string dir_lat = "S";
+			double v_lat = vessel.latitude;
+			if (v_lat > 0)
+				dir_lat = "N";
+
+			return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
+		}
+		#endregion
+
+		#region VESSEL_EXTENSIONS_GENERAL
+		public static double TrueAltitude(Vessel vessel)
+		{
+			double trueAltitude = vessel.orbit.altitude - 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 (vessel.terrainAltitude < 0 && vessel.mainBody.ocean)
+			{
+				trueAltitude = vessel.orbit.altitude;
+			}
+
+			return trueAltitude;
+		}
+
+		public static double Radius(this Vessel vessel)
+		{
+			double radius;
+
+			radius = vessel.altitude;
+
+			if (vessel.mainBody != null)
+			{
+				radius += vessel.mainBody.Radius;
+			}
+
+			return radius;
+		}
+		#endregion
+
+		#region GEOMETRY_UTILS
+		public static double FixAngleDomain(double Angle, bool Degrees = false)
+		{
+			double Extent = 2d * Math.PI;
+			if (Degrees)
+			{
+				Extent = 360d;
+			}
+
+			Angle = Angle % (Extent);
+			if (Angle < 0d)
+			{
+				Angle += Extent;
+			}
+
+			return Angle;
+		}
+
+		public static double FixDegreeDomain(double Angle)
+		{
+			return FixAngleDomain(Angle, true);
+		}
+		#endregion
+
+		private static Dictionary<int, GUI.WindowFunction> functionCache;
+		public static UnityEngine.GUI.WindowFunction GetWindowHandler(Action<int> func)
+		{
+			if (functionCache == null)
+			{
+				functionCache = new Dictionary<int, GUI.WindowFunction>();
+			}
+
+			int hashCode = func.GetHashCode();
+
+			if (!functionCache.ContainsKey(hashCode))
+			{
+				functionCache[hashCode] = delegate (int id)
+				{
+					try
+					{
+						func(id);
+					}
+					#if DEBUG
+					catch (ArgumentException)
+					#else
+					catch (ArgumentException)
+					#endif
+					{
+						Debug.LogWarning(
+							string.Format("[{0}]: ArgumentException caught during window call.  This is not a bug.",
+								func.Target.GetType().Name
+							));
+
+						/*#if DEBUG
+						Debug.LogException(ex);
+						#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
+							));
+					}
+				};
+			}
+
+			return functionCache[hashCode];
+		}
+
+		/// <summary>
+		/// Formats the interval given in seconds as a human-friendly
+		/// time period in [[[[years, ]days, ]hours, ]minutes, and ]seconds.
+		/// 
+		/// Uses sidereal days, since "6 hours per day" is the Kerbal standard.
+		/// </summary>
+		/// <returns>Human readable interval</returns>
+		/// <param name="seconds"></param>
+		public static string FormatInterval(double seconds)
+		{
+			return UnpackedTime.FromSeconds(seconds).FormatAsSpan();
+		}
+
+		/// <summary>
+		/// Formats the date given in seconds since epoch as a human-friendly
+		/// date in the format YY, DD, HH:MM:SS
+		/// </summary>
+		/// <returns>The date.</returns>
+		/// <param name="seconds">Seconds.</param>
+		public static string FormatDate(double seconds)
+		{
+			return UnpackedTime.FromSeconds(seconds).FormatAsDate();
+		}
+
+		public class UnpackedTime
+		{
+			public const double SecondsPerMinute = 60d;
+			public const double SecondsPerHour = 3600d;
+
+			public static double SecondsPerDay
+			{
+				get
+				{
+					if (GameSettings.KERBIN_TIME)
+					{
+						return 21600d;
+					}
+					else
+					{
+						return 86164.1d;
+					}
+				}
+			}
+
+			public static double SecondsPerYear
+			{
+				get
+				{
+					if (GameSettings.KERBIN_TIME)
+					{
+						return 9203545d;
+					}
+					else
+					{
+						return 31558149d;
+					}
+				}
+			}
+
+			public static UnpackedTime FromSeconds(double seconds)
+			{
+				UnpackedTime time = new UnpackedTime();
+
+				time.years = (int)(seconds / SecondsPerYear);
+
+				seconds %= SecondsPerYear;
+
+				time.days = (int)(seconds / SecondsPerDay);
+
+				seconds %= SecondsPerDay;
+
+				time.hours = (int)(seconds / SecondsPerHour);
+
+				seconds %= SecondsPerHour;
+
+				time.minutes = (int)(seconds / SecondsPerMinute);
+
+				seconds %= SecondsPerMinute;
+
+				time.seconds = seconds;
+
+				return time;
+			}
+
+			public static explicit operator UnpackedTime(double seconds)
+			{
+				return FromSeconds(seconds);
+			}
+
+			public static implicit operator double(UnpackedTime time)
+			{
+				return time.ToSeconds();
+			}
+
+			public static UnpackedTime operator+ (UnpackedTime lhs, UnpackedTime rhs)
+			{
+				return FromSeconds(lhs.ToSeconds() + rhs.ToSeconds());
+			}
+
+			public static UnpackedTime operator- (UnpackedTime lhs, UnpackedTime rhs)
+			{
+				return FromSeconds(lhs.ToSeconds() - rhs.ToSeconds());
+			}
+
+			public int years;
+			public int days;
+			public int hours;
+			public int minutes;
+			public double seconds;
+
+			public double ToSeconds()
+			{
+				return (double)years * SecondsPerYear +
+					(double)days * SecondsPerDay +
+					(double)hours * SecondsPerHour +
+					(double)minutes * SecondsPerMinute +
+					seconds;
+			}
+
+			public string FormatAsSpan()
+			{
+				string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:00.0}s";
+				string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:00.0}s";
+				string format_3 = "{0:D2}h {1:D2}m {2:00.0}s";
+				string format_4 = "{0:D2}m {1:00.0}s";
+				string format_5 = "{0:00.0}s";
+
+				if (this.years > 0)
+				{
+					return string.Format(format_1, this.years, this.days, this.hours, this.minutes, this.seconds);
+				}
+				else if (this.days > 0)
+				{
+					return string.Format(format_2, this.days, this.hours, this.minutes, this.seconds);
+				}
+				else if (this.hours > 0)
+				{
+					return string.Format(format_3, this.hours, this.minutes, this.seconds);
+				}
+				else if (this.minutes > 0)
+				{
+					return string.Format(format_4, this.minutes, this.seconds);
+				}
+				else
+				{
+					return string.Format(format_5, this.seconds);
+				}
+			}
+
+			public string FormatAsDate()
+			{
+				string format = "Y{0:D1}, D{1:D1} {2:D2}:{3:D2}:{4:00.0}s";
+
+				return string.Format(format, years, days, hours, minutes, seconds);
+			}
+
+			public UnpackedTime(int years, int days, int hours, int minutes, double seconds)
+			{
+				this.years = years;
+				this.days = days;
+				this.hours = hours;
+				this.minutes = minutes;
+				this.seconds = seconds;
+			}
+
+			public UnpackedTime() : this(0, 0, 0, 0, 0d) {}
+		}
+
+		public static string UppercaseFirst(string s)
+		{
+			if (string.IsNullOrEmpty(s))
+			{
+				return string.Empty;
+			}
+			char[] a = s.ToCharArray();
+			a[0] = char.ToUpper(a[0]);
+			return new string(a);
+		}
+
+		//transfer angles
+		public static double Nivvy_CalcTransferPhaseAngle(double r_current, double r_target, double grav_param)
+		{
+			r_target /= 1000;
+			r_current /= 1000;
+			grav_param /= 1000000000;
+
+			double midpoint = (r_target + r_current) / 2;
+
+			double T_target = (2 * Math.PI) * Math.Sqrt((r_target * r_target * r_target) / grav_param);
+			double T_transfer = (2 * Math.PI) * Math.Sqrt((midpoint * midpoint * midpoint) / grav_param);
+			return 360 * (0.5 - (T_transfer / (2 * T_target)));
+		}
+
+		public static double Younata_DeltaVToGetToOtherBody(double mu, double r1, double r2)
+		{
+			/*			
+            def deltaVToGetToOtherBody(mu, r1, r2):
+            # mu = gravity param of common orbiting body of r1 and r2
+            # (e.g. for mun to minmus, mu is kerbin's gravity param
+            # r1 = initial body's orbit radius
+            # r2 = target body's orbit radius
+		
+            # return value is km/s
+            sur1 = math.sqrt(mu / r1)
+            sr1r2 = math.sqrt(float(2*r2)/float(r1+r2))
+            mult = sr1r2 - 1
+            return sur1 * mult
+            */
+			double sur1, sr1r2, mult;
+			sur1 = Math.Sqrt(mu / r1);
+			sr1r2 = Math.Sqrt((2 * r2) / (r1 + r2));
+			mult = sr1r2 - 1;
+			return sur1 * mult;
+		}
+
+		public static double Younata_DeltaVToExitSOI(double mu, double r1, double r2, double v)
+		{
+			/*			
+            def deltaVToExitSOI(mu, r1, r2, v):
+            # mu = gravity param of current body
+            # r1 = current orbit radius
+            # r2 = SOI radius
+            # v = SOI exit velocity
+            foo = r2 * (v**2) - 2 * mu
+            bar = r1 * foo + (2 * r2 * mu)
+            r = r1*r2
+            return math.sqrt(bar / r)
+            */
+			double foo = r2 * (v * v) - 2 * mu;
+			double bar = r1 * foo + (2 * r2 * mu);
+			double r = r1 * r2;
+			return Math.Sqrt(bar / r);
+		}
+
+		public static double Younata_TransferBurnPoint(double r, double v, double angle, double mu)
+		{
+			/*			
+            def transferBurnPoint(r, v, angle, mu):
+            # r = parking orbit radius
+            # v = ejection velocity
+            # angle = phase angle (from function phaseAngle())
+            # mu = gravity param of current body.
+            epsilon = ((v**2)/2) - (mu / r)
+            h = r * v * math.sin(angle)
+            e = math.sqrt(1 + ((2 * epsilon * h**2)/(mu**2)))
+            theta = math.acos(1.0 / e)
+            degrees = theta * (180.0 / math.pi)
+            return 180 - degrees
+            */
+			double epsilon, h, ee, theta, degrees;
+			epsilon = ((v * v) / 2) - (mu / r);
+			h = r * v * Math.Sin(angle);
+			ee = Math.Sqrt(1 + ((2 * epsilon * (h * h)) / (mu * mu)));
+			theta = Math.Acos(1.0 / ee);
+			degrees = theta * (180.0 / Math.PI);
+			return 180 - degrees;
+			// returns the ejection angle
+		}
+
+		public static double Adammada_CurrrentPhaseAngle(
+			double body_LAN,
+			double body_orbitPct,
+			double origin_LAN,
+			double origin_orbitPct
+		)
+		{
+			double angle = (body_LAN / 360 + body_orbitPct) - (origin_LAN / 360 + origin_orbitPct);
+			if (angle > 1)
+				angle = angle - 1;
+			if (angle < 0)
+				angle = angle + 1;
+			if (angle > 0.5)
+				angle = angle - 1;
+			angle = angle * 360;
+			return angle;
+		}
+
+		public static double Adammada_CurrentEjectionAngle(
+			double vessel_long,
+			double origin_rotAngle,
+			double origin_LAN,
+			double origin_orbitPct
+		)
+		{
+			//double eangle = ((FlightGlobals.ActiveVOID.vessel.longitude + orbiting.rotationAngle) - (orbiting.orbit.LAN / 360 + orbiting.orbit.orbitPercent) * 360);
+			double eangle = ((vessel_long + origin_rotAngle) - (origin_LAN / 360 + origin_orbitPct) * 360);
+
+			while (eangle < 0)
+				eangle = eangle + 360;
+			while (eangle > 360)
+				eangle = eangle - 360;
+			if (eangle < 270)
+				eangle = 90 - eangle;
+			else
+				eangle = 450 - eangle;
+			return eangle;
+		}
+
+		public static double mrenigma03_calcphase(Vessel vessel, CelestialBody target)   //calculates phase angle between the current body and target body
+		{
+			Vector3d vecthis = new Vector3d();
+			Vector3d vectarget = new Vector3d();
+			vectarget = target.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+
+			if ((vessel.mainBody.name == "Sun") || (vessel.mainBody.referenceBody.referenceBody.name == "Sun"))
+			{
+				vecthis = vessel.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+			}
+			else
+			{
+				vecthis = vessel.mainBody.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+			}
+
+			vecthis = Vector3d.Project(new Vector3d(vecthis.x, 0, vecthis.z), vecthis);
+			vectarget = Vector3d.Project(new Vector3d(vectarget.x, 0, vectarget.z), vectarget);
+
+			Vector3d prograde = new Vector3d();
+			prograde = Quaternion.AngleAxis(90, Vector3d.forward) * vecthis;
+
+			double phase = Vector3d.Angle(vecthis, vectarget);
+
+			if (Vector3d.Angle(prograde, vectarget) > 90)
+				phase = 360 - phase;
+
+			return (phase + 360) % 360;
+		}
+
+		public static double adjustCurrPhaseAngle(double transfer_angle, double curr_phase)
+		{
+			if (transfer_angle < 0)
+			{
+				if (curr_phase > 0)
+					return (-1 * (360 - curr_phase));
+				else if (curr_phase < 0)
+					return curr_phase;
+			}
+			else if (transfer_angle > 0)
+			{
+				if (curr_phase > 0)
+					return curr_phase;
+				else if (curr_phase < 0)
+					return (360 + curr_phase);
+			}
+			return curr_phase;
+		}
+
+		public static double adjust_current_ejection_angle(double curr_ejection)
+		{
+			//curr_ejection WILL need to be adjusted once for all transfers as it returns values ranging -180 to 180
+			// need 0-360 instead
+			//
+			// ie i have -17 in the screenshot
+			// need it to show 343
+			//
+			// do this
+			//
+			// if < 0, add curr to 360  // 360 + (-17) = 343
+			// else its good as it is
+
+			if (curr_ejection < 0)
+				return 360 + curr_ejection;
+			else
+				return curr_ejection;
+
+		}
+
+		public static double adjust_transfer_ejection_angle(double trans_ejection, double trans_phase)
+		{
+			// if transfer_phase_angle < 0 its a lower transfer
+			//180 + curr_ejection
+			// else if transfer_phase_angle > 0 its good as it is
+
+			if (trans_phase < 0)
+				return 180 + trans_ejection;
+			else
+				return trans_ejection;
+
+		}
+
+		public static void display_transfer_angles_SUN2PLANET(CelestialBody body, Vessel vessel)
+		{
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Phase angle (curr/trans):");
+			GUILayout.Label(
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + VOID_Tools.Nivvy_CalcTransferPhaseAngle(
+					vessel.orbit.semiMajorAxis,
+					body.orbit.semiMajorAxis,
+					vessel.mainBody.gravParameter
+				).ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Transfer velocity:");
+			GUILayout.Label(
+				(VOID_Tools.Younata_DeltaVToGetToOtherBody(
+					(vessel.mainBody.gravParameter / 1000000000),
+					(vessel.orbit.semiMajorAxis / 1000),
+					(body.orbit.semiMajorAxis / 1000)
+				) * 1000).ToString("F2") + "m/s",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+		}
+
+		public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
+		{
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
+				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
+				(vessel.mainBody.orbit.semiMajorAxis / 1000),
+				(body.orbit.semiMajorAxis / 1000)
+			);
+			double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
+				(vessel.mainBody.gravParameter / 1000000000),
+				(vessel.orbit.semiMajorAxis / 1000),
+				(vessel.mainBody.sphereOfInfluence / 1000),
+				Math.Abs(dv1)
+			);
+
+			double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
+				(vessel.orbit.semiMajorAxis / 1000),
+				dv2,
+				(Math.PI / 2.0),
+				(vessel.mainBody.gravParameter / 1000000000)
+			);
+			double curr_ejection_angle = VOID_Tools.Adammada_CurrentEjectionAngle(
+				FlightGlobals.ActiveVessel.longitude,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			);
+
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
+				vessel.mainBody.orbit.semiMajorAxis,
+				body.orbit.semiMajorAxis,
+				vessel.mainBody.referenceBody.gravParameter
+			) % 360;
+			double curr_phase_angle = VOID_Tools.Adammada_CurrrentPhaseAngle(
+				body.orbit.LAN,
+				body.orbit.orbitPercent,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			);
+
+			double adj_phase_angle = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+			double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+			double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Phase angle (curr/trans):");
+			GUILayout.Label(
+				adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Ejection angle (curr/trans):");
+			GUILayout.Label(
+				adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Transfer velocity:");
+			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+		}
+
+		public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
+		{
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
+				(vessel.mainBody.gravParameter / 1000000000),
+				(vessel.orbit.semiMajorAxis / 1000),
+				(body.orbit.semiMajorAxis / 1000)
+			);
+
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
+				vessel.orbit.semiMajorAxis,
+				body.orbit.semiMajorAxis,
+				vessel.mainBody.gravParameter
+			);
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Phase angle (curr/trans):");
+			GUILayout.Label(
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Transfer velocity:");
+			GUILayout.Label((dv1 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+		}
+
+		public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
+		{
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
+				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
+				(vessel.mainBody.orbit.semiMajorAxis / 1000),
+				(body.orbit.semiMajorAxis / 1000)
+			);
+			double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
+				(vessel.mainBody.gravParameter / 1000000000),
+				(vessel.orbit.semiMajorAxis / 1000),
+				(vessel.mainBody.sphereOfInfluence / 1000),
+				Math.Abs(dv1)
+			);
+			double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
+				(vessel.orbit.semiMajorAxis / 1000),
+				dv2,
+				(Math.PI / 2.0),
+				(vessel.mainBody.gravParameter / 1000000000)
+			);
+
+			double curr_phase_angle = VOID_Tools.Adammada_CurrrentPhaseAngle(
+				body.orbit.LAN,
+				body.orbit.orbitPercent,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			);
+			double curr_ejection_angle = VOID_Tools.Adammada_CurrentEjectionAngle(
+				FlightGlobals.ActiveVessel.longitude,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			);
+
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
+				vessel.mainBody.orbit.semiMajorAxis,
+				body.orbit.semiMajorAxis,
+				vessel.mainBody.referenceBody.gravParameter
+			) % 360;
+
+			double adj_phase_angle = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+			//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
+
+			//new stuff
+			//
+			double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+			double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
+			//
+			//
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Phase angle (curr/trans):");
+			GUILayout.Label(
+				adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Ejection angle (curr/trans):");
+			GUILayout.Label(
+				adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Transfer velocity:");
+			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+		}
+
+		public static string get_heading_text(double heading)
+		{
+			if (heading > 348.75 || heading <= 11.25)
+				return "N";
+			else if (heading > 11.25 && heading <= 33.75)
+				return "NNE";
+			else if (heading > 33.75 && heading <= 56.25)
+				return "NE";
+			else if (heading > 56.25 && heading <= 78.75)
+				return "ENE";
+			else if (heading > 78.75 && heading <= 101.25)
+				return "E";
+			else if (heading > 101.25 && heading <= 123.75)
+				return "ESE";
+			else if (heading > 123.75 && heading <= 146.25)
+				return "SE";
+			else if (heading > 146.25 && heading <= 168.75)
+				return "SSE";
+			else if (heading > 168.75 && heading <= 191.25)
+				return "S";
+			else if (heading > 191.25 && heading <= 213.75)
+				return "SSW";
+			else if (heading > 213.75 && heading <= 236.25)
+				return "SW";
+			else if (heading > 236.25 && heading <= 258.75)
+				return "WSW";
+			else if (heading > 258.75 && heading <= 281.25)
+				return "W";
+			else if (heading > 281.25 && heading <= 303.75)
+				return "WNW";
+			else if (heading > 303.75 && heading <= 326.25)
+				return "NW";
+			else if (heading > 326.25 && heading <= 348.75)
+				return "NNW";
+			else
+				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
@@ -1,26 +1,36 @@
+// VOID
 //
-//  VOID_Orbital.cs
+// VOID_Transfer.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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.Collections.Generic;
+using System.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -29,7 +39,7 @@
 	{
 		protected List<CelestialBody> selectedBodies = new List<CelestialBody>();
 
-		public VOID_Transfer()
+		public VOID_Transfer() : base()
 		{
 			this._Name = "Transfer Angle Information";
 
@@ -58,7 +68,7 @@
 
 					if (selectedBodies.Contains(body))
 					{
-						Tools.display_transfer_angles_SUN2PLANET(body, vessel);  //show phase angles for each selected body
+						VOID_Tools.display_transfer_angles_SUN2PLANET(body, vessel);  //show phase angles for each selected body
 						tad_targeting(body);    //display Set/Unset Target button for each selected body
 					}
 			    }
@@ -81,7 +91,7 @@
 
 			            if (selectedBodies.Contains(body))
 			            {
-			                Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
+			                VOID_Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
 			                tad_targeting(body);    //display Set/Unset Target button
 			            }
 			        }
@@ -100,7 +110,7 @@
 
 			        if (selectedBodies.Contains(body))
 			        {
-			            Tools.display_transfer_angles_PLANET2MOON(body, vessel);
+			            VOID_Tools.display_transfer_angles_PLANET2MOON(body, vessel);
 			            tad_targeting(body);    //display Set/Unset Target button
 			        }
 			    }
@@ -123,7 +133,7 @@
 
 						if (selectedBodies.Contains(body))
 						{
-							Tools.display_transfer_angles_MOON2MOON(body, vessel);
+							VOID_Tools.display_transfer_angles_MOON2MOON(body, vessel);
 							tad_targeting(body);    //display Set/Unset Target button
 						}
 					}

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -1,156 +1,43 @@
+// VOID
 //
-//  VOID_Orbital.cs
+// VOID_VesselInfo.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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 KerbalEngineer.VesselSimulator;
+using KerbalEngineer.Extensions;
 using KSP;
 using System;
 using System.Collections.Generic;
+using ToadicusTools;
 using UnityEngine;
-using Engineer.VesselSimulator;
 
 namespace VOID
 {
 	public class VOID_VesselInfo : VOID_WindowModule
 	{
-		protected VOID_DoubleValue geeForce = new VOID_DoubleValue(
-			"G-force",
-			new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
-			"gees"
-		);
-
-		protected VOID_IntValue partCount = new VOID_IntValue(
-			"Parts",
-			new Func<int>(() => VOID_Core.Instance.vessel.Parts.Count),
-			""
-		);
-
-		protected VOID_DoubleValue totalMass = new VOID_DoubleValue(
-			"Total Mass",
-			new Func<double>(() => VOID_Core.Instance.vessel.GetTotalMass()),
-			"tons"
-		);
-
-		protected VOID_DoubleValue resourceMass = new VOID_DoubleValue(
-			"Resource Mass",
-			delegate()
-			{
-				double rscMass = 0;
-				foreach (Part part in VOID_Core.Instance.vessel.Parts)
-				{
-					rscMass += part.GetResourceMass();
-				}
-				return rscMass;
-			},
-			"tons"
-		);
-
-		protected VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
-			"DeltaV (Current Stage)",
-			delegate()
-			{
-				if (SimManager.Instance.Stages == null ||
-			    	SimManager.Instance.Stages.Length <= Staging.lastStage
-			    )
-					return double.NaN;
-				return SimManager.Instance.Stages[Staging.lastStage].deltaV;
-			},
-			"m/s"
-		);
-
-		protected VOID_DoubleValue totalDeltaV = new VOID_DoubleValue(
-			"DeltaV (Total)",
-			delegate()
-			{
-				if (SimManager.Instance.Stages == null)
-					return double.NaN;
-				return SimManager.Instance.LastStage.totalDeltaV;
-			},
-			"m/s"
-		);
-
-		protected VOID_FloatValue mainThrottle = new VOID_FloatValue(
-			"Throttle",
-			new Func<float>(() => VOID_Core.Instance.vessel.ctrlState.mainThrottle * 100f),
-			"%"
-		);
-
-		protected VOID_StrValue currmaxThrust = new VOID_StrValue(
-			"Thrust (curr/max)",
-			delegate()
-			{
-				if (SimManager.Instance.Stages == null)
-					return "N/A";
-
-				double currThrust = SimManager.Instance.LastStage.actualThrust;
-				double maxThrust = SimManager.Instance.LastStage.thrust;
-
-				return string.Format(
-					"{0} / {1}",
-					currThrust.ToString("F1"),
-					maxThrust.ToString("F1")
-				);
-			}
-		);
-
-		protected VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
-			"T:W (curr/max)",
-			delegate()
-			{
-				if (SimManager.Instance.Stages == null)
-					return "N/A";
-
-				double currThrust = SimManager.Instance.LastStage.actualThrust;
-				double maxThrust = SimManager.Instance.LastStage.thrust;
-				double mass = VOID_Core.Instance.vessel.GetTotalMass();
-				double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-				                 Math.Pow(
-					                 VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
-					                 2
-					                );
-				double weight = mass * gravity;
-
-				return string.Format(
-					"{0} / {1}",
-					(currThrust / weight).ToString("F2"),
-					(maxThrust / weight).ToString("F2")
-				);
-			}
-		);
-
-		protected VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
-			"Max T:W @ surface",
-			delegate()
-			{
-				if (SimManager.Instance.Stages == null)
-					return double.NaN;
-
-				double maxThrust = SimManager.Instance.LastStage.thrust;
-				double mass = VOID_Core.Instance.vessel.GetTotalMass();
-				double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
-				                 Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
-				double weight = mass * gravity;
-
-				return maxThrust / weight;
-			},
-			""
-		);
-
 		public VOID_VesselInfo() : base()
 		{
 			this._Name = "Vessel Information";
@@ -161,46 +48,46 @@
 
 		public override void ModuleWindow(int _)
 		{
-			base.ModuleWindow (_);
-
 			if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
 			{
-				SimManager.Instance.RequestSimulation();
+				SimManager.RequestSimulation();
 			}
-
-			Stage[] stages = SimManager.Instance.Stages;
 
 			GUILayout.BeginVertical();
 
 			GUILayout.Label(
 				vessel.vesselName,
-				VOID_Core.Instance.LabelStyles["center_bold"],
+				VOID_Styles.labelCenterBold,
 				GUILayout.ExpandWidth(true));
 
-			this.geeForce.DoGUIHorizontal ("F2");
+			VOID_Data.geeForce.DoGUIHorizontal ("F2");
 
-			this.partCount.DoGUIHorizontal ();
+			VOID_Data.partCount.DoGUIHorizontal ();
 
-			this.totalMass.DoGUIHorizontal ("F1");
+			VOID_Data.totalMass.DoGUIHorizontal ("F3");
 
-			this.resourceMass.DoGUIHorizontal ("F1");
+			VOID_Data.stageResourceMass.DoGUIHorizontal("F2");
 
-			this.stageDeltaV.DoGUIHorizontal (3, false);
+			VOID_Data.resourceMass.DoGUIHorizontal("F2");
 
-			this.totalDeltaV.DoGUIHorizontal (3, false);
+			VOID_Data.stageDeltaV.DoGUIHorizontal (3, false);
 
-			this.mainThrottle.DoGUIHorizontal ("F0");
+			VOID_Data.totalDeltaV.DoGUIHorizontal (3, false);
 
-			this.currmaxThrust.DoGUIHorizontal ();
+			VOID_Data.mainThrottle.DoGUIHorizontal ("F0");
 
-			this.currmaxThrustWeight.DoGUIHorizontal ();
+			VOID_Data.currmaxThrust.DoGUIHorizontal ();
 
-			this.surfaceThrustWeight.DoGUIHorizontal ("F2");
+			VOID_Data.currmaxThrustWeight.DoGUIHorizontal ();
+
+			VOID_Data.surfaceThrustWeight.DoGUIHorizontal ("F2");
+
+			VOID_Data.intakeAirStatus.DoGUIHorizontal();
 
 			GUILayout.EndVertical();
+
 			GUI.DragWindow();
 		}
 	}
 }
 
-

--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -1,26 +1,35 @@
+// VOID
 //
-//  VOID_Orbital.cs
+// VOID_VesselRegister.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
+// 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.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 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.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -49,7 +58,7 @@
 			}
 		}
 
-		public VOID_VesselRegister()
+		public VOID_VesselRegister() : base()
 		{
 			this._Name = "Vessel Register";
 
@@ -60,7 +69,7 @@
 
 		public override void ModuleWindow(int _)
 		{
-			if (!VOID_Core.Instance.allVesselTypes.Any())
+			if (!this.core.allVesselTypes.Any())
 			{
 				return;
 			}
@@ -71,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, VOID_Styles.labelCenterBold, 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(), VOID_Styles.labelCenterBold, 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";
@@ -106,8 +115,8 @@
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(
-				Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s  @ " + seletedBody.bodyName,
-				VOID_Core.Instance.LabelStyles["center"],
+				VOID_Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s  @ " + seletedBody.bodyName,
+				VOID_Styles.labelCenter,
 				GUILayout.ExpandWidth(true));
 			GUILayout.EndHorizontal();
 
@@ -133,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
 							{