diff --git a/urdf/diffbot_description.urdf.xacro b/urdf/diffbot_description.urdf.xacro
index e5a8766..abadfe1 100644
--- a/urdf/diffbot_description.urdf.xacro
+++ b/urdf/diffbot_description.urdf.xacro
@@ -21,18 +21,7 @@
     <xacro:property name="z_offset" value="-${base_height/2}" />
     <!-- Offset of main Axis to center of base body (Axis of rotation for steering) -->
     <xacro:property name="base_offset" value="0.11" />
-
-    <!-- dummy link - used for ros2 control so it stops complaining?
-    <link name="${prefix}dummy_link">
-    </link>
-
-    <joint name="${prefix}dummy_joint" type="fixed">
-      <parent link="${prefix}dummy_link" />
-      <child link="${prefix}base_link" />
-    </joint> -->
-
-    <!-- needed for replacement to find mesh dir: package://cps_loki_description/mesh/ -->
-
+    
     <!-- Base Link -->
     <link name="${prefix}base_link">
       <visual>
diff --git a/urdf/diffbot_description.urdf.xacro.20.11 copy.2023 b/urdf/diffbot_description.urdf.xacro.20.11 copy.2023
new file mode 100644
index 0000000..e5a8766
--- /dev/null
+++ b/urdf/diffbot_description.urdf.xacro.20.11 copy.2023	
@@ -0,0 +1,242 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro">
+
+  <xacro:macro name="diffbot" params="prefix">
+
+    <!-- Constants for robot dimensions -->
+    <xacro:property name="PI" value="3.1415926535897931"/>
+    <xacro:property name="base_mass" value="0.3" />
+    <!-- arbitrary value for base mass -->
+    <xacro:property name="base_width" value="0.26" />
+    <!-- Updated wheel spacing to 25cm -->
+    <xacro:property name="base_length" value="0.34" />
+    <xacro:property name="base_height" value="0.123" />
+    <xacro:property name="wheel_mass" value="0.3" />
+    <!-- arbitrary value for wheel mass -->
+    <xacro:property name="wheel_len" value="0.020" />
+    <xacro:property name="wheel_radius" value="0.0625" />
+    <xacro:property name="caster_wheel_mass" value="0.1" />
+    <!-- arbitrary value for caster wheel mass -->
+    <xacro:property name="caster_wheel_radius" value="0.04" />
+    <xacro:property name="z_offset" value="-${base_height/2}" />
+    <!-- Offset of main Axis to center of base body (Axis of rotation for steering) -->
+    <xacro:property name="base_offset" value="0.11" />
+
+    <!-- dummy link - used for ros2 control so it stops complaining?
+    <link name="${prefix}dummy_link">
+    </link>
+
+    <joint name="${prefix}dummy_joint" type="fixed">
+      <parent link="${prefix}dummy_link" />
+      <child link="${prefix}base_link" />
+    </joint> -->
+
+    <!-- needed for replacement to find mesh dir: package://cps_loki_description/mesh/ -->
+
+    <!-- Base Link -->
+    <link name="${prefix}base_link">
+      <visual>
+        <origin xyz="0 0 0" rpy="0 0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/base_link_visual.stl"/>
+        </geometry>
+        <material name="base_link_material">
+          <color rgba="0.80032179626883115375 0.81301836741632160788 0.83346199892499306383 1.0"/>
+        </material>
+      </visual>
+      <collision>
+        <origin xyz="0 0 0" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/base_link_collision.stl"/>
+        </geometry>
+      </collision>
+      <inertial>
+        <origin xyz="0 0 0" rpy="0 0 0"/>
+        <mass value="8.4123950268139715547" />
+        <inertia ixx="0.090166990291185383777" ixy="4.7429179749238352248e-18" ixz="1.4209310488728267579e-18" iyy="0.055481261106946747064" iyz="-0.01112159061226025876" izz="0.13051099377067149065" />
+      </inertial>
+    </link>
+
+    <!-- Adding base_footprint for mapping (Needed by slam toolbox) -->
+    <link name="${prefix}base_footprint">
+    </link>
+
+    <joint name="${prefix}base_footprint_joint" type="fixed">
+      <parent link="${prefix}base_link" />
+      <child link="${prefix}base_footprint" />
+      <origin xyz="0 0 ${z_offset}" rpy="0 0 0" />
+    </joint>
+
+    <!-- right wheel joint -->
+    <joint name="${prefix}right_wheel_joint" type="continuous">
+      <origin xyz="0 ${-0.125 - wheel_len /2} ${z_offset}" rpy="${PI / 2} 0 0" />
+      <parent link="${prefix}base_link" />
+      <child link="${prefix}right_wheel" />
+      <axis xyz="0 0 -1"/>
+      <limit effort="1" velocity="20" />
+      <joint_properties friction="0.0"/>
+    </joint>
+
+    <!-- right wheel Link -->
+    <link name="${prefix}right_wheel">
+      <visual>
+        <origin xyz="0 0 ${wheel_len}" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/wheel_link_visual.stl"/>
+        </geometry>
+        <material name="wheel_link_material">
+          <color rgba="0.50196078431372548323 0.50196078431372548323 0.50196078431372548323 1.0"/>
+        </material>
+      </visual>
+      <collision>
+        <origin xyz="0 0 ${wheel_len}" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/wheel_link_collision.stl"/>
+        </geometry>
+      </collision>
+      <inertial>
+        <origin xyz="-1.3877787807814456755e-17 -6.9388939039072283776e-18 -0.017500000000000029421" rpy="0 0 0"/>
+        <mass value="0.43298678305638949038" />
+        <inertia ixx="0.00043196650576949035269" ixy="0" ixz="1.8666117243005040269e-36" iyy="0.00043196650576949029848" iyz="0" izz="0.00078373880522818965139" />
+      </inertial>
+    </link>
+
+    <!-- left wheel joint -->
+    <joint name="${prefix}left_wheel_joint" type="continuous">
+      <origin xyz="0 ${0.125 + wheel_len /2} ${z_offset}" rpy="${PI / 2} 0 0" />
+      <parent link="${prefix}base_link" />
+      <child link="${prefix}left_wheel" />
+      <axis xyz="0 0 1" />
+      <limit effort="1" velocity="20" />
+      <joint_properties friction="0.0" />
+    </joint>
+
+    <!-- left wheel Link -->
+    <link name="${prefix}left_wheel">
+      <visual>
+        <origin xyz="0 0 ${wheel_len}" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/wheel_link_2_visual.stl"/>
+        </geometry>
+        <material name="wheel_link_2_material">
+          <color rgba="0.50196078431372548323 0.50196078431372548323 0.50196078431372548323 1.0"/>
+        </material>
+      </visual>
+      <collision>
+        <origin xyz="0 0 ${wheel_len}" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/wheel_link_2_collision.stl"/>
+        </geometry>
+      </collision>
+      <inertial>
+        <origin xyz="-2.7755575615628913511e-17 0 -0.017500000000000015543" rpy="0 0 0"/>
+        <mass value="0.43298678305638949038" />
+        <inertia ixx="0.00043196650576949035269" ixy="1.4778173856800390343e-52" ixz="-4.8081924471597460774e-36" iyy="0.00043196650576949029848" iyz="0" izz="0.00078373880522818965139" />
+      </inertial>
+    </link>
+
+    <!-- caster wheel joint -->
+    <joint name="${prefix}caster_wheel_joint" type="fixed">
+      <origin xyz="-${base_length / 2 + base_offset} 0 -0.02" rpy="0 0 ${PI}" />
+      <parent link="${prefix}base_link" />
+      <child link="${prefix}caster_wheel" />
+      <axis xyz="0 0 1"/>
+      <limit effort="1" velocity="20" />
+      <joint_properties friction="0.0"/>
+    </joint>
+
+    <!-- caster wheel Link -->
+    <link name="${prefix}caster_wheel">
+      <visual>
+        <origin xyz="0 0 0" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/caster_link_visual.stl"/>
+        </geometry>
+        <material name="caster_link_material">
+          <color rgba="0.69513764518117548974 0.69513764518117548974 0.69513764518117548974 1.0"/>
+        </material>
+      </visual>
+      <collision>
+        <origin xyz="0 0 0" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/caster_link_collision.stl"/>
+        </geometry>
+      </collision>
+      <inertial>
+        <origin xyz="-0.0043392325658342043027 -0.026018163063004008662 -0.040087257391101506487" rpy="0 0 0"/>
+        <mass value="0.4365196214157913146" />
+        <inertia ixx="0.00065232223366267665706" ixy="-2.2812456870885095374e-05" ixz="-2.819328031928647945e-05" iyy="0.00051934268155350092177" iyz="-0.00016904771834628737077" izz="0.00028021186492738437085" />
+      </inertial>
+    </link>
+
+    <!-- laser_link -->
+    <link name="${prefix}laser_link">
+      <visual>
+        <origin xyz="0 0 0" rpy="${PI} -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/laser_link_visual.stl"/>
+        </geometry>
+        <material name="laser_link_material">
+          <color rgba="0.49803921568627451677 0.49803921568627451677 0.49803921568627451677 1.0"/>
+        </material>
+      </visual>
+      <collision>
+        <origin xyz="0 0 0" rpy="${PI} -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/laser_link_collision.stl"/>
+        </geometry>
+      </collision>
+      <inertial>
+        <origin xyz="8.0502568807622093404e-21 2.7755575615628913511e-17 -0.01526549883836261258" rpy="${PI} 0 0"/>
+        <mass value="0.065307030550339775776" />
+        <inertia ixx="1.578111853789072904e-05" ixy="-4.8590457654361857326e-53" ixz="1.0816309858643350309e-52" iyy="1.5781118537890654501e-05" iyz="9.8088682514084147142e-38" izz="1.9760068210357054465e-05" />
+      </inertial>
+    </link>
+
+    <!-- laser_joint -->
+    <joint name="${prefix}laser_joint" type="fixed">
+      <origin xyz="-0.015 0 0.09" rpy="0 0 0"/>
+      <parent link="${prefix}base_link" />
+      <child link="${prefix}laser_link" />
+      <axis xyz="0 0 1"/>
+      <limit effort="1" velocity="20" />
+      <joint_properties friction="0.0"/>
+    </joint>
+
+    <!-- camera_link -->
+    <link name="${prefix}camera_link">
+      <visual>
+        <origin xyz="0 0 0" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/camera_link_visual.stl"/>
+        </geometry>
+        <material name="camera_link_material">
+          <color rgba="0.26274509803921569651 0.28235294117647058432 0.30196078431372547213 1.0"/>
+        </material>
+      </visual>
+      <collision>
+        <origin xyz="0 0 0" rpy="0 -0 0" />
+        <geometry>
+          <mesh filename="package://cps_loki_description/mesh/camera_link_collision.stl"/>
+        </geometry>
+      </collision>
+      <inertial>
+        <origin xyz="5.3378961738576549005e-07 0.0016484827975361887251 -0.020840554768345870285" rpy="0 0 0"/>
+        <mass value="0.064008494238512375629" />
+        <inertia ixx="1.7394518695567356026e-05" ixy="-4.87317899857206066e-10" ixz="-1.7982620680900958214e-11" iyy="3.2074360900148983727e-05" iyz="2.0892555595878115295e-06" izz="2.8321439372619354409e-05" />
+      </inertial>
+    </link>
+
+
+    <!-- Camera Joint -->
+    <joint name="${prefix}camera_joint" type="fixed">
+      <origin xyz="${base_length / 2 - base_offset} 0 0" rpy="0 0 ${PI}" />
+      <parent link="${prefix}base_link" />
+      <child link="${prefix}camera_link" />
+      <axis xyz="0 0 1"/>
+      <limit effort="1" velocity="20" />
+      <joint_properties friction="0.0"/>
+    </joint>
+
+  </xacro:macro>
+</robot>
\ No newline at end of file
diff --git a/urdf/inertial_macros.xacro b/urdf/inertial_macros.xacro
new file mode 100644
index 0000000..e69de29