diff --git a/Assets/Scripts/RaccoonShowcase.cs b/Assets/Scripts/RaccoonShowcase.cs
index 75061b82..dc9d914d 100644
--- a/Assets/Scripts/RaccoonShowcase.cs
+++ b/Assets/Scripts/RaccoonShowcase.cs
@@ -18,7 +18,9 @@ public class RaccoonShowcase : Script
     private double rotation = 0.0;
     private Vector3 scale = Vector3.Zero;
     private double originalScale = 1.0f;
+    [Tooltip("Sample list of Vector3s.")]
     public List<Vector3> vecList = new List<Vector3>(new Vector3[] { new Vector3(1, 2, 3), new Vector3(4, 5, 6) });
+    [Range(-5, 5)]
     public List<int> intList = new List<int>(new int[] { 2, 8, 2, 6, 8, 0, 1 });
     public List<Light.Type> enumList = new List<Light.Type>(new Light.Type[] { Light.Type.Point, Light.Type.Directional, Light.Type.Ambient });
     public RaccoonShowcase(GameObject gameObj) : base(gameObj) {}
diff --git a/SHADE_Engine/src/Editor/SHEditorUI.cpp b/SHADE_Engine/src/Editor/SHEditorUI.cpp
index 06c3f5c5..40e08042 100644
--- a/SHADE_Engine/src/Editor/SHEditorUI.cpp
+++ b/SHADE_Engine/src/Editor/SHEditorUI.cpp
@@ -53,9 +53,12 @@ namespace SHADE
   /*-----------------------------------------------------------------------------------*/
   /* ImGui Wrapper Functions - Organizers                                              */
   /*-----------------------------------------------------------------------------------*/
-  bool SHEditorUI::CollapsingHeader(const std::string& title)
+  bool SHEditorUI::CollapsingHeader(const std::string& title, bool* isHovered)
   {
-    return ImGui::CollapsingHeader(title.c_str(), ImGuiTreeNodeFlags_DefaultOpen);
+    const bool OPENED = ImGui::CollapsingHeader(title.c_str(), ImGuiTreeNodeFlags_DefaultOpen);
+    if (isHovered)
+        *isHovered = ImGui::IsItemHovered();
+    return OPENED;
   }
   
   void SHEditorUI::SameLine()
diff --git a/SHADE_Engine/src/Editor/SHEditorUI.h b/SHADE_Engine/src/Editor/SHEditorUI.h
index 4f11a025..f450ac0d 100644
--- a/SHADE_Engine/src/Editor/SHEditorUI.h
+++ b/SHADE_Engine/src/Editor/SHEditorUI.h
@@ -85,8 +85,9 @@ namespace SHADE
     /// Wraps up ImGui::CollapsingHeader().
     /// </summary>
     /// <param name="title">Label for the header.</param>
+    /// <param name="isHovered>If set, stores the hover state of this widget.</param>
     /// <returns>True if the header is open, false otherwise.</returns>
-    static bool CollapsingHeader(const std::string& title);
+    static bool CollapsingHeader(const std::string& title, bool* isHovered = nullptr);
     static void SameLine();
 	static void Separator();
 
diff --git a/SHADE_Managed/src/Editor/Editor.cxx b/SHADE_Managed/src/Editor/Editor.cxx
index c4cf187b..ebc39c60 100644
--- a/SHADE_Managed/src/Editor/Editor.cxx
+++ b/SHADE_Managed/src/Editor/Editor.cxx
@@ -178,7 +178,7 @@ namespace SHADE
                 RangeAttribute^ rangeAttrib = hasAttribute<RangeAttribute^>(field);
                 System::Collections::IList^ iList = safe_cast<System::Collections::IList^>(field->GetValue(object));
 
-                if (SHEditorUI::CollapsingHeader(Convert::ToNative(field->Name)))
+                if (SHEditorUI::CollapsingHeader(Convert::ToNative(field->Name), &isHovered))
                 {
                     if (SHEditorUI::Button("Add Item"))
                     {