diff --git a/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs b/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs
index 04d7f84a..3654203c 100644
--- a/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs
+++ b/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs
@@ -1,5 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
 using PyTK.CustomElementHandler;
 using Revitalize.Framework.Graphics;
 using StardewValley;
@@ -63,10 +64,25 @@ namespace Revitalize.Framework.Objects
 
         public override bool checkForAction(Farmer who, bool justCheckingForActivity = false)
         {
+            var mState = Microsoft.Xna.Framework.Input.Mouse.GetState();
+            var keyboardState = Game1.GetKeyboardState();
+
+            if (mState.RightButton == Microsoft.Xna.Framework.Input.ButtonState.Pressed && (keyboardState.IsKeyDown(Keys.LeftShift) || keyboardState.IsKeyDown(Keys.RightShift))==false)
+            {
+                Revitalize.ModCore.log("Right clicked!");
+                return rightClicked(who);
+            }
+            else if(mState.RightButton == Microsoft.Xna.Framework.Input.ButtonState.Pressed && (keyboardState.IsKeyDown(Keys.LeftShift) || keyboardState.IsKeyDown(Keys.RightShift)))
+            {
+                return shiftRightClicked(who);
+            }
+
             if (justCheckingForActivity)
+            {
                 return true;
-            Revitalize.ModCore.ModMonitor.Log("Interact with core object!");
-            return true;
+            }
+            Revitalize.ModCore.log("Left clicked!");
+            return this.clicked(who);
         }
 
         public override ICustomObject recreate(Dictionary<string, string> additionalSaveData, object replacement)
@@ -76,6 +92,36 @@ namespace Revitalize.Framework.Objects
         }
 
 
+        public virtual bool rightClicked(Farmer who)
+        {
+            // Game1.showRedMessage("YOOO");
+            //do some stuff when the right button is down
+            // rotate();
+            if (this.heldObject.Value != null)
+            {
+                //  Game1.player.addItemByMenuIfNecessary(this.heldObject);
+                // this.heldObject = null;
+            }
+            else
+            {
+                //   this.heldObject = Game1.player.ActiveObject;
+                //  Game1.player.removeItemFromInventory(heldObject);
+            }
+            return true;
+        }
+
+        public virtual bool shiftRightClicked(Farmer who)
+        {
+            Revitalize.ModCore.log("Shift right clicked!");
+            return true;
+        }
+
+        public override bool clicked(Farmer who)
+        {
+            Revitalize.ModCore.log("Clicky click!");
+            return base.clicked(who);
+        }
+
         public override Color getCategoryColor()
         {
             return info.categoryColor;
diff --git a/GeneralMods/Revitalize/Revitalize.csproj b/GeneralMods/Revitalize/Revitalize.csproj
index e07b12ca..b2e8891d 100644
--- a/GeneralMods/Revitalize/Revitalize.csproj
+++ b/GeneralMods/Revitalize/Revitalize.csproj
@@ -58,6 +58,9 @@
   <ItemGroup>
     <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Framework\Objects\Furniture\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">