diff --git a/SHADE_Engine/src/Editor/SHEditorUI.cpp b/SHADE_Engine/src/Editor/SHEditorUI.cpp
index f3760b4d..cc63c565 100644
--- a/SHADE_Engine/src/Editor/SHEditorUI.cpp
+++ b/SHADE_Engine/src/Editor/SHEditorUI.cpp
@@ -157,7 +157,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    return ImGui::Checkbox("#", &value);
+    return ImGui::Checkbox("##", &value);
   }
   bool SHEditorUI::InputInt(const std::string& label, int& value, bool* isHovered)
   {
@@ -165,7 +165,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    return ImGui::InputInt("#", &value,
+    return ImGui::InputInt("##", &value,
                            1, 10,
                            ImGuiInputTextFlags_EnterReturnsTrue);
   }
@@ -176,7 +176,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    const bool CHANGED = InputInt("#", signedVal);
+    const bool CHANGED = InputInt("##", signedVal);
     if (CHANGED)
     {
       signedVal = std::clamp(signedVal, 0, std::numeric_limits<int>::max());
@@ -190,7 +190,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    return ImGui::InputFloat("#", &value,
+    return ImGui::InputFloat("##", &value,
                              0.1f, 1.0f, "%.3f", 
                              ImGuiInputTextFlags_EnterReturnsTrue);
   }
@@ -200,7 +200,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    return ImGui::InputDouble("#", &value,
+    return ImGui::InputDouble("##", &value,
                               0.1, 1.0, "%.3f", 
                               ImGuiInputTextFlags_EnterReturnsTrue);
   }
@@ -210,7 +210,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    return ImGui::InputDouble("#", &value,
+    return ImGui::InputDouble("##", &value,
                               1.0, 45.0, "%.3f", 
                               ImGuiInputTextFlags_EnterReturnsTrue);
   }
@@ -280,7 +280,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    const bool CHANGED = ImGui::InputText("#", &buffer[0], TEXT_FIELD_MAX_LENGTH);
+    const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH);
     if (CHANGED)
     {
       value = std::string(buffer.data(), buffer.data() + TEXT_FIELD_MAX_LENGTH);
@@ -327,7 +327,7 @@ namespace SHADE
     if (isHovered)
         *isHovered = ImGui::IsItemHovered();
     ImGui::SameLine();
-    if (ImGui::BeginCombo("#", INITIAL_NAME.c_str(), ImGuiComboFlags_None))
+    if (ImGui::BeginCombo("##", INITIAL_NAME.c_str(), ImGuiComboFlags_None))
     {
       for (int i = 0; i < enumNames.size(); ++i)
       {
diff --git a/SHADE_Managed/src/Components/RigidBody.cxx b/SHADE_Managed/src/Components/RigidBody.cxx
index 172b928b..12861600 100644
--- a/SHADE_Managed/src/Components/RigidBody.cxx
+++ b/SHADE_Managed/src/Components/RigidBody.cxx
@@ -148,6 +148,14 @@ namespace SHADE
     {
         return Convert::ToCLI(GetNativeComponent()->GetTorque());
     }
+    bool RigidBody::Interpolating::get()
+    {
+        return GetNativeComponent()->IsInterpolating();
+    }
+    void RigidBody::Interpolating::set(bool value)
+    {
+        GetNativeComponent()->SetInterpolate(value);
+    }
     
     /*---------------------------------------------------------------------------------*/
     /* Force Functions                                                                 */
diff --git a/SHADE_Managed/src/Components/RigidBody.hxx b/SHADE_Managed/src/Components/RigidBody.hxx
index b3e031ba..d3a30612 100644
--- a/SHADE_Managed/src/Components/RigidBody.hxx
+++ b/SHADE_Managed/src/Components/RigidBody.hxx
@@ -129,6 +129,11 @@ namespace SHADE
         {
             Vector3 get();
         }
+        property bool Interpolating
+        {
+            bool get();
+            void set(bool value);
+        }
         
         /*-----------------------------------------------------------------------------*/
         /* Force Functions                                                             */