diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 6629539d..ec400ffb 100644
--- a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -54,6 +54,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
+    <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.6284.20368, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/Essentials/PepperDashEssentials/Audio/EssentialsVolumeLevelConfig.cs b/Essentials/PepperDashEssentials/Audio/EssentialsVolumeLevelConfig.cs
index 2ce59344..12108564 100644
--- a/Essentials/PepperDashEssentials/Audio/EssentialsVolumeLevelConfig.cs
+++ b/Essentials/PepperDashEssentials/Audio/EssentialsVolumeLevelConfig.cs
@@ -17,7 +17,7 @@ namespace PepperDash.Essentials
     /// <summary>
     /// 
     /// </summary>
-    public class EssentialsPresentationVolumesConfig
+    public class EssentialsRoomVolumesConfig
     {
         public EssentialsVolumeLevelConfig Master { get; set; }
         public EssentialsVolumeLevelConfig Program { get; set; }
@@ -25,7 +25,6 @@ namespace PepperDash.Essentials
         public EssentialsVolumeLevelConfig AudioCallTx { get; set; }
     }
 
-
     /// <summary>
     /// 
     /// </summary>
diff --git a/Essentials/PepperDashEssentials/Room/EssentialsHuddleSpaceRoom.cs b/Essentials/PepperDashEssentials/Room/EssentialsHuddleSpaceRoom.cs
index 327582fc..455fcd9b 100644
--- a/Essentials/PepperDashEssentials/Room/EssentialsHuddleSpaceRoom.cs
+++ b/Essentials/PepperDashEssentials/Room/EssentialsHuddleSpaceRoom.cs
@@ -79,6 +79,8 @@ namespace PepperDash.Essentials
 
         public string DefaultSourceItem { get; set; }
 
+        public ushort DefaultVolume { get; set; }
+
 		/// <summary>
 		/// If room is off, enables power on to last source. Default true
 		/// </summary>
@@ -175,8 +177,18 @@ namespace PepperDash.Essentials
                         }
                     };
 
-                disp.IsWarmingUpFeedback.OutputChange += (o, a) => { IsWarmingUpFeedback.FireUpdate(); };
-                disp.IsCoolingDownFeedback.OutputChange += (o, a) => { IsCoolingDownFeedback.FireUpdate(); };
+                disp.IsWarmingUpFeedback.OutputChange += (o, a) => 
+                { 
+                    IsWarmingUpFeedback.FireUpdate();
+                    if (!IsWarmingUpFeedback.BoolValue)
+                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                };
+                disp.IsCoolingDownFeedback.OutputChange += (o, a) => 
+                {
+                    IsCoolingDownFeedback.FireUpdate(); 
+                    if (IsCoolingDownFeedback.BoolValue)
+                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                };
             }
           
 			SourceListKey = "default";
@@ -254,7 +266,6 @@ namespace PepperDash.Essentials
                         {
                             Debug.Console(1, this, "*#* EXCEPTION in end usage tracking (257):\r{0}", e); 
                         }
-
                     }
 
 					// Let's run it
diff --git a/Essentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs b/Essentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs
index d70f5501..89525d9e 100644
--- a/Essentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs
+++ b/Essentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs
@@ -32,6 +32,7 @@ namespace PepperDash.Essentials
                 huddle.LogoUrl = props.Logo.GetUrl();
                 huddle.SourceListKey = props.SourceListKey;
                 huddle.DefaultSourceItem = props.DefaultSourceItem;
+                huddle.DefaultVolume = (ushort)(props.Volumes.Master.Level * 65535 / 100);
                 return huddle;
 			}
 			else if (typeName == "presentation")
@@ -68,6 +69,7 @@ namespace PepperDash.Essentials
         public int ShutdownPromptSeconds { get; set; }
         public EssentialsRoomOccSensorConfig OccupancySensors { get; set; }
         public EssentialsLogoPropertiesConfig Logo { get; set; }
+        public EssentialsRoomVolumesConfig Volumes { get; set; }
 	}
 
 
@@ -120,7 +122,6 @@ namespace PepperDash.Essentials
         public List<string> DisplayKeys { get; set; }
         public string SourceListKey { get; set; }
         public bool HasDsp { get; set; }
-        public EssentialsPresentationVolumesConfig Volumes { get; set; }
 
         public EssentialsPresentationRoomPropertiesConfig()
         {
diff --git a/Essentials/PepperDashEssentials/Room/UI/CrestronTouchpanelPropertiesConfig.cs b/Essentials/PepperDashEssentials/Room/UI/CrestronTouchpanelPropertiesConfig.cs
index 3279c2c1..f327e0d5 100644
--- a/Essentials/PepperDashEssentials/Room/UI/CrestronTouchpanelPropertiesConfig.cs
+++ b/Essentials/PepperDashEssentials/Room/UI/CrestronTouchpanelPropertiesConfig.cs
@@ -11,6 +11,8 @@
 		public bool UsesSplashPage { get; set; }
 		public bool ShowDate { get; set; }
 		public bool ShowTime { get; set; }
+        public UiSetupPropertiesConfig Setup { get; set; }
+
         /// <summary>
         /// The count of sources that will trigger the "additional" arrows to show on the SRL.
         /// Defaults to 5
@@ -22,4 +24,10 @@
             SourcesOverflowCount = 5;
         }
 	}
+
+    public class UiSetupPropertiesConfig
+    {
+        public bool IsVisible { get; set; }
+    }
+
 }
\ No newline at end of file
diff --git a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs
index f8ae437f..6c599488 100644
--- a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs	
+++ b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs	
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.UI;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -213,12 +214,16 @@ namespace PepperDash.Essentials
             //TriList.SetSigFalseAction(UIBoolJoin.RoomHeaderButtonPress, () =>
             //    ShowInterlockedModal(UIBoolJoin.RoomHeaderPageVisible));
 
+            // Setup button
             TriList.SetSigHeldAction(UIBoolJoin.GearHeaderButtonPress, 2000,
                 () => ShowInterlockedModal(UIBoolJoin.TechPanelSetupVisible));
-
             TriList.SetSigFalseAction(UIBoolJoin.TechPagesExitButton, () =>
                 HideCurrentInterlockedModal());
-            TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true;
+#warning This gets overridden by config after NYU demo
+            if(TriList is CrestronApp)
+                TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = false;
+            else
+                TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true;
 
 			// power-related functions
             // Note: some of these are not directly-related to the huddle space UI, but are held over
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index 031e51a1..e9daf0be 100644
Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ
diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll
index 6732b2cd..c8f15a7c 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ