diff --git a/example_files/example_project_combined.json b/example_files/example_project_combined.json
index 88e4e6c6..9e146923 100644
--- a/example_files/example_project_combined.json
+++ b/example_files/example_project_combined.json
@@ -650,7 +650,10 @@
         "system_type": "Residential - furnace and central air conditioner",
         "heating_system_fuel_type": "natural gas",
         "onsite_parking_fraction": 1,
-        "template": "Residential IECC 2015 - Customizable Template Sep 2020"
+        "template": "Residential IECC 2015 - Customizable Template Sep 2020",
+        "geometry_unit_orientation": 90.0,
+        "geometry_unit_aspect_ratio" : 1.0
+
       },
       "geometry": {
         "type": "Polygon",
diff --git a/example_files/mappers/Baseline.rb b/example_files/mappers/Baseline.rb
index d21521a7..2d7b3ca7 100644
--- a/example_files/mappers/Baseline.rb
+++ b/example_files/mappers/Baseline.rb
@@ -757,6 +757,24 @@ def create_osw(scenario, features, feature_names)
             rescue StandardError
             end
 
+            ######################################################################
+
+            # Geometry Orientation and Aspect Ratio
+            # Orientation (North=0, East=90, South=180, West=270)
+            begin
+              args[:geometry_unit_orientation] = feature.geometry_unit_orientation
+            rescue StandardError
+            end
+
+            # Aspect Ratio
+            # The ratio of front/back wall length to left/right wall length for the unit, excluding any protruding garage wall area.
+            begin
+              args[:geometry_unit_aspect_ratio] = feature.geometry_unit_aspect_ratio
+            rescue StandardError
+            end
+
+            ######################################################################      
+
             # Occupancy Calculation Type
             begin
               if feature.occupancy_calculation_type == 'operational'