diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade
index d068f3ca..dadf7bf0 100644
--- a/Assets/Scenes/Level2.shade
+++ b/Assets/Scenes/Level2.shade
@@ -21,6 +21,7 @@
       Color: {x: 1, y: 1, z: 1, w: 1}
       Layer: 4294967295
       Strength: 1
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 5
@@ -35,6 +36,7 @@
       Color: {x: 0.901608765, y: 0.867841423, z: 1, w: 1}
       Layer: 4294967295
       Strength: 0.699999988
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 65674
@@ -54,6 +56,7 @@
       Color: {x: 0, y: 0, z: 0, w: 1}
       Layer: 4294967295
       Strength: 1
+      Casting Shadows: true
       IsActive: true
   Scripts: ~
 - EID: 240
@@ -80,6 +83,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -131,6 +135,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -182,6 +187,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -233,6 +239,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -284,6 +291,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -335,6 +343,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -386,6 +395,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -437,6 +447,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -494,6 +505,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -535,6 +547,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -576,6 +589,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -617,6 +631,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -658,6 +673,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -709,6 +725,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -760,6 +777,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -811,6 +829,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -862,6 +881,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -913,6 +933,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -964,6 +985,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1015,6 +1037,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1066,6 +1089,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1117,6 +1141,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1168,6 +1193,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1219,6 +1245,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1270,6 +1297,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1321,6 +1349,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1372,6 +1401,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1423,6 +1453,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1474,6 +1505,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1525,6 +1557,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1576,6 +1609,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1627,6 +1661,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1684,6 +1719,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1735,6 +1771,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1786,6 +1823,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1837,6 +1875,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1888,6 +1927,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1939,6 +1979,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1996,6 +2037,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2047,6 +2089,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2098,6 +2141,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2149,6 +2193,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2200,6 +2245,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2251,6 +2297,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2308,6 +2355,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2349,6 +2397,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2390,6 +2439,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2431,6 +2481,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2472,6 +2523,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2529,6 +2581,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2570,6 +2623,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2611,6 +2665,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2652,6 +2707,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2695,6 +2751,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: true
       Sleeping Enabled: true
@@ -2757,6 +2814,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: true
       Sleeping Enabled: true
@@ -2999,6 +3057,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: false
       Interpolate: false
       Sleeping Enabled: true
@@ -3180,6 +3239,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3227,6 +3287,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3268,6 +3329,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3309,6 +3371,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3350,6 +3413,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3391,6 +3455,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3438,6 +3503,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3479,6 +3545,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3520,6 +3587,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3561,6 +3629,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3602,6 +3671,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3649,6 +3719,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3690,6 +3761,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3731,6 +3803,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3772,6 +3845,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3813,6 +3887,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3860,6 +3935,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3901,6 +3977,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3942,6 +4019,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3983,6 +4061,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4024,6 +4103,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4071,6 +4151,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4112,6 +4193,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4153,6 +4235,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4194,6 +4277,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4235,6 +4319,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4282,6 +4367,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4323,6 +4409,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4364,6 +4451,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4405,6 +4493,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4446,6 +4535,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4493,6 +4583,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4534,6 +4625,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4575,6 +4667,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4616,6 +4709,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4657,6 +4751,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4704,6 +4799,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4745,6 +4841,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4786,6 +4883,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4827,6 +4925,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4868,6 +4967,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4915,6 +5015,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4956,6 +5057,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4997,6 +5099,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5038,6 +5141,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5079,6 +5183,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5126,6 +5231,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5167,6 +5273,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5208,6 +5315,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5249,6 +5357,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5373,6 +5482,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -7421,7 +7531,7 @@
   Components:
     Transform Component:
       Translate: {x: 2, y: 0, z: 0}
-      Rotate: {x: -0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Renderable Component:
@@ -14149,4 +14259,31 @@
       Perspective: true
       FOV: 90
       IsActive: true
+  Scripts: ~
+- EID: 537
+  Name: ShadowFixRoof
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.0146873593, y: 2.83242893, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 5.15999985, y: 5.15999985, z: 5.15999985}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142812576
+      Material: 127069936
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2, y: 0.0500000007, z: 2}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: -0.00999999978, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
   Scripts: ~
\ No newline at end of file
diff --git a/Assets/Scenes/Scene2.shade b/Assets/Scenes/Scene2.shade
index 891c9664..c45d8b51 100644
--- a/Assets/Scenes/Scene2.shade
+++ b/Assets/Scenes/Scene2.shade
@@ -26,7 +26,7 @@
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0.189419448, z: 0}
+      Translate: {x: 0, y: 0.201105013, z: 0}
       Rotate: {x: 0.00523597933, y: -2.96353412, z: -6.40293041e-10}
       Scale: {x: 1.00000191, y: 1, z: 1.00000191}
       IsActive: true
@@ -41,9 +41,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.006237939, y: -0.000393368304, z: 0}
-      Rotate: {x: -0, y: 2.79945588, z: 0}
-      Scale: {x: 1.0000881, y: 1, z: 1.0000881}
+      Translate: {x: 0.00623797067, y: -0.000395311916, z: -2.03726813e-08}
+      Rotate: {x: 1.35041773e-08, y: 2.79945588, z: -9.6043955e-09}
+      Scale: {x: 1.00008798, y: 1, z: 1.0000881}
       IsActive: true
     Renderable Component:
       Mesh: 144838771
@@ -67,6 +67,7 @@
       Color: {x: 1, y: 1, z: 1, w: 1}
       Layer: 4294967295
       Strength: 0
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 4
@@ -81,6 +82,7 @@
       Color: {x: 1, y: 1, z: 1, w: 1}
       Layer: 4294967295
       Strength: 0.600000024
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 5
@@ -97,4 +99,50 @@
       Mesh: 141771688
       Material: 124370424
       IsActive: true
+  Scripts: ~
+- EID: 6
+  Name: TrajectoryTest
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -3.39616156, y: 3.66783714, z: -0.722039163}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.100000001
+      Gravity Scale: 1
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: false
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Sphere
+          Radius: 1
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+    Trajectory Renderer Component:
+      Mesh: 134305891
+      Start Color: {x: 1, y: 0.951541781, z: 0}
+      Start Alpha: 1
+      End Color: {x: 0, y: 1, z: 0.748898745}
+      End Alpha: 1
+      "Color Eval Rate ": 0.192000002
+      IsActive: true
   Scripts: ~
\ No newline at end of file
diff --git a/Assets/Shaders/DeferredComposite_CS.glsl b/Assets/Shaders/DeferredComposite_CS.glsl
index 18f53de4..e9f9eb0c 100644
--- a/Assets/Shaders/DeferredComposite_CS.glsl
+++ b/Assets/Shaders/DeferredComposite_CS.glsl
@@ -1,4 +1,5 @@
 #version 450
+#extension GL_EXT_nonuniform_qualifier : require
 
 struct DirectionalLightStruct
 {
@@ -63,8 +64,6 @@ float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV
   // Perform perspective division and convert to 0 to 1 range
   vec3 converted = (fragPosLightPOV.xyz / fragPosLightPOV.w) * vec3(0.5f) + vec3(0.5f);
 
-  // float sampledDepth = texture(shadowMap, converted.xy).r;
-  // float sampledDepth = texture(shadowMap, converted.xy).z;
   vec2 moments = texture(shadowMap, converted.xy).xy;
 
   if (converted.x < 0.0f || converted.x > 1.0f || converted.y < 0.0f || converted.y > 1.0f)
@@ -121,18 +120,21 @@ void main()
   // light layer index
   uint lightLayer =  lightLayerAndNormal.x;
   
+  // Normals are stored in 2 32-bit uints (only first 48 bits are used) where they can be unpacked in 3 floats so we unpack them here.
   vec3 worldNormal = vec3 (unpackHalf2x16 (lightLayerAndNormal.y).xy, unpackHalf2x16 (lightLayerAndNormal.z).x);
 
   vec3 fragColor = vec3 (0.0f);
 
   vec4 shadowMapColor = vec4 (1.0f);
 
+  // Shadow multiplier
+  float shadowValue = 1.0f;
+
   for (int i = 0; i < lightCounts.ambientLights; ++i)
   {
     if ((lightLayer & AmbLightData.aLightData[i].cullingMask) != 0)
     {
       // Just do some add
-      //fragColor += pixelDiffuse.rgb * AmbLightData.aLightData[i].ambientColor.rgb * vec3 (0.5f);
       fragColor += pixelDiffuse.rgb * AmbLightData.aLightData[i].ambientColor.rgb * vec3 (AmbLightData.aLightData[i].strength);
     }
   }
@@ -153,12 +155,16 @@ void main()
       // If the shadow map is enabled (test the bit)
       if ((DirLightData.dLightData[i].shadowData & uint(1)) == 1)
       {
-        // calculate shadow map here
-        fragColor.rgb *= CalcShadowValue (shadowMaps[0], positionWorld, DirLightData.dLightData[i].pvMatrix, worldNormal, DirLightData.dLightData[i].directionWorld.xyz).xxx;
+        uint shadowMapIndex = (DirLightData.dLightData[i].shadowData >> 8);
+        shadowValue = min (shadowValue, CalcShadowValue (shadowMaps[nonuniformEXT(shadowMapIndex)], positionWorld, DirLightData.dLightData[i].pvMatrix, worldNormal, DirLightData.dLightData[i].directionWorld.xyz));
       }
     }
   }
 
+  // calculate shadow map here
+  if (shadowValue != 0.0f)
+    fragColor.rgb *= shadowValue;
+
   float ssaoVal = imageLoad (ssaoBlurredImage, globalThread).r;
   fragColor *= ssaoVal;
 
@@ -167,12 +173,4 @@ void main()
 
   // store result into result image
   imageStore(targetImage, ivec2(gl_GlobalInvocationID.xy), vec4(fragColor.rgb, 1.0f));
-
-  // vec2 normTexCoords = vec2 (gl_GlobalInvocationID.xy) / vec2 (1024.0f);
-  // vec4 shadowMapVal = texture(shadowMaps[0], normTexCoords);
-  // if (normTexCoords.x > 1.0f || normTexCoords.y > 1.0f)
-  //   shadowMapVal = vec4(0.0f);
-
-  // imageStore(targetImage, ivec2(gl_GlobalInvocationID.xy), shadowMapVal.xxxx);
-
 }
\ No newline at end of file
diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb
index 57401b13..1ec2bcf0 100644
Binary files a/Assets/Shaders/DeferredComposite_CS.shshaderb and b/Assets/Shaders/DeferredComposite_CS.shshaderb differ
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
index a15687cb..91ec0cea 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
@@ -186,7 +186,7 @@ namespace SHADE
       .flags = vk::DescriptorBindingFlagBits::eVariableDescriptorCount,
     };
 
-    // For global data (generic data and textures)
+    // For global data (generic data and textures). NOT USED.
     Handle<SHVkDescriptorSetLayout> shadowMapDescLayout = logicalDevice->CreateDescriptorSetLayout({ shadowMapBinding });
     SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, shadowMapDescLayout->GetVkHandle(), "[Descriptor Set Layout] Shadow Maps");
     
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index bf2f1ec2..397edf74 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -942,7 +942,8 @@ namespace SHADE
     else
     {
       // get the shadow map node
-      renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName)->SetDynamicActive(false);
+      if (auto node = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName))
+        node->SetDynamicActive(false);
     }
 
     return eventPtr->handle;
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp
index f8578647..de930596 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp
@@ -120,21 +120,17 @@ namespace SHADE
   {
     lightData.castShadows = flag;
     
-    // If the flag is true 
-    if (flag)
-    {
-      // Create new event and broadcast it
-      SHLightShadowEvent newEvent;
-      newEvent.lightEntity = GetEID();
+    // Create new event and broadcast it
+    SHLightShadowEvent newEvent;
+    newEvent.lightEntity = GetEID();
 
-      // If shadow map index is invalid, that means light is enabling shadow for the first time.
-      newEvent.firstEnable = (lightData.shadowMapIndex == SHLightData::INVALID_SHADOW_MAP_INDEX);
+    // If shadow map index is invalid, that means light is enabling shadow for the first time.
+    newEvent.firstEnable = (lightData.shadowMapIndex == SHLightData::INVALID_SHADOW_MAP_INDEX);
 
-      // pass the flag to the event
-      newEvent.enableShadow = flag;
+    // pass the flag to the event
+    newEvent.enableShadow = flag;
 
-      SHEventManager::BroadcastEvent<SHLightShadowEvent>(newEvent, SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT);
-    }
+    SHEventManager::BroadcastEvent<SHLightShadowEvent>(newEvent, SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT);
     
   }
 
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
index 27685d69..a2b9cc0a 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
@@ -526,7 +526,7 @@ namespace SHADE
       if (auto renderer = light.GetRenderer())
       {
         //SHMatrix orthoMatrix = SHMatrix::OrthographicRH()
-        renderer->UpdateDataManual(frameIndex, GetViewMatrix(&light), SHMatrix::OrthographicLH(15.0f, 15.0f, 1.0f, 80.0f));
+        renderer->UpdateDataManual(frameIndex, GetViewMatrix(&light), SHMatrix::OrthographicLH(20.0f, 20.0f, 1.0f, 80.0f));
       }
 
       auto enumValue = SHUtilities::ConvertEnum(light.GetLightData().type);
@@ -636,7 +636,7 @@ namespace SHADE
       shadowMapImageSamplers.emplace_back(NEW_IMAGE_VIEW, shadowMapSampler, vk::ImageLayout::eShaderReadOnlyOptimal);
 
       // Add to container of shadow maps
-      shadowMapIndexing.emplace(lightEntity, static_cast<uint32_t> (shadowMaps.size()));
+      shadowMapIndexing.emplace(lightEntity, static_cast<uint32_t> (shadowMaps.size() - 1u));
 
       usedIndex = static_cast<uint32_t>(shadowMapImageSamplers.size()) - 1u;
     }
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
index f3744d83..fd3d8b02 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
@@ -35,6 +35,9 @@ namespace SHADE
     //! evolving rate of the color
     float colorEvolveRate;
 
+    //! Entity to simulate trajectory of
+    //EntityID 
+
   public:
     /*-----------------------------------------------------------------------*/
     /* PRIVATE MEMBER FUNCTIONS                                              */
@@ -61,6 +64,7 @@ namespace SHADE
     void ClearPositions(void) noexcept;
     bool HasPositions(void) const noexcept;
 
+    void SimulateTrajectory (EntityID eid) noexcept;
 
     RTTR_ENABLE()
 
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
index cbf593d4..3ff7c1ec 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
@@ -11,6 +11,8 @@
 #include "Graphics/RenderGraph/SHSubpass.h"
 #include "Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h"
 #include "Graphics/MiddleEnd/Interface/SHRenderer.h"
+#include "Physics/System/SHPhysicsSystem.h"
+#include "ECS_Base/Managers/SHSystemManager.h"
 
 namespace SHADE
 {
@@ -74,6 +76,8 @@ namespace SHADE
 
   void SHTrajectoryRenderingSubSystem::Run(uint32_t frameIndex) noexcept
   {
+    auto* physicsSystem = SHSystemManager::GetSystem<SHPhysicsSystem>();
+
     auto& comps = SHComponentManager::GetDense<SHTrajectoryRenderableComponent>();
     for (auto& comp : comps)
     {
@@ -86,7 +90,21 @@ namespace SHADE
       //  x += 0.5f;
       //}
 
-      //comp.SetPositions (test);
+      std::vector<SHVec3> positions{};
+      std::vector<SHQuaternion> quats{};
+      physicsSystem->SimulateBody
+      (positions, quats,
+        SHPhysicsSystem::SimulateBodyInfo
+        {
+         .bodyEID = comp.GetEID(),
+         .force = SHVec3 {30.0f, 100.0f, 30.0f},
+         .continuousForce = false,
+        .timeStep = 0.1f,
+        .maxSteps = 100,
+        }
+      );
+
+      comp.SetPositions(positions);
       // If has positions, feed data to buffer.
       if (comp.HasPositions())
       {
diff --git a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
index d1c37e3a..166b3c6e 100644
--- a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
+++ b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
@@ -194,9 +194,9 @@ namespace SHADE
 
             // In reality, the check for variable descriptor sets do not exists in spirv-reflect. Fortunately, when a shader
             // defines a boundless descriptor binding in the shader, the information reflected makes the array dimensions
-            // contain a 1 element of value 1. Knowing that having an array [1] doesn't make sense, we can use this to 
+            // contain a 1 element of value 0. Knowing that having an array [1] doesn't make sense, we can use this to 
             // signify a variable sized binding. 
-            if (reflectedBinding->array.dims[0] == 1)
+            if (reflectedBinding->array.dims_count == 1 && reflectedBinding->array.dims[0] == 0)
             {
               // variable binding has to be the last in the set
               if (i == set->binding_count - 1)
diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp
index ef1b6b03..72176f4e 100644
--- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp
+++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp
@@ -118,7 +118,7 @@ namespace SHADE
     if (layouts.size() == descMappings.at(SHPredefinedDescriptorTypes::RENDER_GRAPH_NODE_COMPUTE_RESOURCE) + 1)
     {
       Handle<SHVkDescriptorSetLayout> computeResourceLayout = {};
-        computeResourceLayout = layouts[descMappings.at(SHPredefinedDescriptorTypes::RENDER_GRAPH_NODE_COMPUTE_RESOURCE)];
+      computeResourceLayout = layouts[descMappings.at(SHPredefinedDescriptorTypes::RENDER_GRAPH_NODE_COMPUTE_RESOURCE)];
 
       // create compute resources
       computeResource = graphStorage->resourceHub->Create<ComputeResource>();