From e52f40068772cd96546cc97a61b935514ff415a9 Mon Sep 17 00:00:00 2001
From: Sam Carlberg <sam@slfc.dev>
Date: Fri, 17 Jan 2025 02:24:11 -0500
Subject: [PATCH] [wpiunits] Add Measure.per overloads for all known unit types
 (#7699)

Instead of only providing per(TimeUnit)

Useful for making conversion factors easier, eg `Inches.of(10).per(Rotation)` vs `Inches.of(10).per(Rotation.one())`

Update VelocityUnit.one() and VelocityUnit.zero() to return Velocity objects instead of generic Measure<? extends VelocityUnit<D>>; VelocityUnit is final, so the wildcard generic is unnecessary, and this makes the generated `per` functions possible for this type
---
 .../main/java/Measure-interface.java.jinja    |  37 ++-
 .../wpi/first/units/measure/Acceleration.java | 125 +++++++-
 .../edu/wpi/first/units/measure/Angle.java    | 125 +++++++-
 .../units/measure/AngularAcceleration.java    | 125 +++++++-
 .../first/units/measure/AngularMomentum.java  | 125 +++++++-
 .../first/units/measure/AngularVelocity.java  | 125 +++++++-
 .../edu/wpi/first/units/measure/Current.java  | 125 +++++++-
 .../first/units/measure/Dimensionless.java    | 125 +++++++-
 .../edu/wpi/first/units/measure/Distance.java | 125 +++++++-
 .../edu/wpi/first/units/measure/Energy.java   | 125 +++++++-
 .../edu/wpi/first/units/measure/Force.java    | 125 +++++++-
 .../wpi/first/units/measure/Frequency.java    | 125 +++++++-
 .../units/measure/LinearAcceleration.java     | 125 +++++++-
 .../first/units/measure/LinearMomentum.java   | 125 +++++++-
 .../first/units/measure/LinearVelocity.java   | 125 +++++++-
 .../edu/wpi/first/units/measure/Mass.java     | 125 +++++++-
 .../first/units/measure/MomentOfInertia.java  | 125 +++++++-
 .../edu/wpi/first/units/measure/Mult.java     | 125 +++++++-
 .../java/edu/wpi/first/units/measure/Per.java | 125 +++++++-
 .../edu/wpi/first/units/measure/Power.java    | 125 +++++++-
 .../wpi/first/units/measure/Resistance.java   | 125 +++++++-
 .../wpi/first/units/measure/Temperature.java  | 125 +++++++-
 .../edu/wpi/first/units/measure/Time.java     | 125 +++++++-
 .../edu/wpi/first/units/measure/Torque.java   | 125 +++++++-
 .../edu/wpi/first/units/measure/Velocity.java | 125 +++++++-
 .../edu/wpi/first/units/measure/Voltage.java  | 125 +++++++-
 .../java/edu/wpi/first/units/Measure.java     | 275 +++++++++++++++++-
 .../edu/wpi/first/units/VelocityUnit.java     |   8 +-
 28 files changed, 3300 insertions(+), 145 deletions(-)

diff --git a/wpiunits/src/generate/main/java/Measure-interface.java.jinja b/wpiunits/src/generate/main/java/Measure-interface.java.jinja
index 80ffe0a7e09..608900f2b51 100644
--- a/wpiunits/src/generate/main/java/Measure-interface.java.jinja
+++ b/wpiunits/src/generate/main/java/Measure-interface.java.jinja
@@ -86,11 +86,6 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt
   default {{ helpers['type_usage'](name) }} divide(double divisor) {
     return ({{ helpers['type_usage'](name) }}) div(divisor);
   }
-
-  @Override
-  default {{ config[name]['divide']['Time'] or "Velocity<{}>".format(helpers['mtou'](name)) }} per(TimeUnit period) {
-    return div(period.of(1));
-  }
 {% for unit in math_units -%}
 {% if unit == "Dimensionless" %}
   @Override
@@ -147,6 +142,15 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt
   default {{ config[name]['divide'][unit] }} divide({{ unit }} divisor) {
     return div(divisor);
   }
+
+  @Override
+  default {{ config[name]['divide'][unit] }} per({{ helpers['mtou'](unit) }} divisorUnit) {
+{%- if unit == "Mult<?, ?>" or unit == "Per<?, ?>" %}
+    return div(divisorUnit.ofNative(1));
+{%- else %}
+    return div(divisorUnit.one());
+{%- endif %}
+  }
 {% elif unit == "Time" %}
   @Override
   default Velocity<{{ helpers['mtou'](name) }}> div({{ unit }} divisor) {
@@ -164,6 +168,15 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt
   default Velocity<{{ helpers['mtou'](name) }}> divide({{ unit }} divisor) {
     return div(divisor);
   }
+
+  @Override
+  default Velocity<{{ helpers['mtou'](name) }}> per({{ helpers['mtou'](unit) }} divisorUnit) {
+{%- if unit == "Mult<?, ?>" or unit == "Per<?, ?>" %}
+    return div(divisorUnit.ofNative(1));
+{%- else %}
+    return div(divisorUnit.one());
+{%- endif %}
+  }
 {% elif unit == name %}
   @Override
   default Dimensionless div({{ unit }} divisor) {
@@ -181,6 +194,11 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt
   default Dimensionless divide({{ unit }} divisor) {
     return div(divisor);
   }
+
+  @Override
+  default Dimensionless per({{ helpers['mtou'](unit) }} divisorUnit) {
+    return div(divisorUnit.one());
+  }
 {% else %}
   @Override
   default Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}> div({{ unit }} divisor) {
@@ -198,6 +216,15 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt
   default Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}> divide({{ unit }} divisor) {
     return div(divisor);
   }
+
+  @Override
+  default Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}> per({{ helpers['mtou'](unit) }} divisorUnit) {
+{%- if unit == "Mult<?, ?>" or unit == "Per<?, ?>" %}
+    return div(divisorUnit.ofNative(1));
+{%- else %}
+    return div(divisorUnit.one());
+{%- endif %}
+  }
 {% endif -%}
 {% endif -%}
 {% endfor -%}
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java
index ac4f6860976..9a007dae74f 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java
@@ -87,11 +87,6 @@ default Acceleration<D> divide(double divisor) {
     return (Acceleration<D>) div(divisor);
   }
 
-  @Override
-  default Velocity<AccelerationUnit<D>> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<AccelerationUnit<D>, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<AccelerationUnit<D>, AccelerationUnit<?>> divide(Acceleration<?> div
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<AccelerationUnit<D>, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<AccelerationUnit<D>, AngularAccelerationUnit> divide(AngularAccelera
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<AccelerationUnit<D>, AngularMomentumUnit> divide(AngularMomentum div
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<AccelerationUnit<D>, AngularVelocityUnit> divide(AngularVelocity div
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<AccelerationUnit<D>, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Acceleration<D> div(Dimensionless divisor) {
     return (Acceleration<D>) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<AccelerationUnit<D>, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<AccelerationUnit<D>, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<AccelerationUnit<D>, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<AccelerationUnit<D>, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<AccelerationUnit<D>, LinearAccelerationUnit> divide(LinearAccelerati
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<AccelerationUnit<D>, LinearMomentumUnit> divide(LinearMomentum divis
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<AccelerationUnit<D>, LinearVelocityUnit> divide(LinearVelocity divis
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<AccelerationUnit<D>, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<AccelerationUnit<D>, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<AccelerationUnit<D>, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<AccelerationUnit<D>, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<AccelerationUnit<D>, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<AccelerationUnit<D>, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<AccelerationUnit<D>, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<AccelerationUnit<D>> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<AccelerationUnit<D>> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<AccelerationUnit<D>, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<AccelerationUnit<D>, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AccelerationUnit<D>, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<AccelerationUnit<D>, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AccelerationUnit<D>, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java
index 23b99572417..812b239a7ba 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java
@@ -87,11 +87,6 @@ default Angle divide(double divisor) {
     return (Angle) div(divisor);
   }
 
-  @Override
-  default AngularVelocity per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<AngleUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<AngleUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Dimensionless divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<AngleUnit, AngularAccelerationUnit> divide(AngularAcceleration divis
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<AngleUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<AngleUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<AngleUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Angle div(Dimensionless divisor) {
     return (Angle) Radians.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<AngleUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<AngleUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<AngleUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularVelocity times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<AngleUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<AngleUnit, LinearAccelerationUnit> divide(LinearAcceleration divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<AngleUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<AngleUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<AngleUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<AngleUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<AngleUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngleUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<AngleUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngleUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<AngleUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<AngleUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<AngleUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default AngularVelocity divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default AngularVelocity per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<AngleUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<AngleUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngleUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<AngleUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngleUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java
index d5cac08a792..d90cbe2056f 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java
@@ -87,11 +87,6 @@ default AngularAcceleration divide(double divisor) {
     return (AngularAcceleration) div(divisor);
   }
 
-  @Override
-  default Velocity<AngularAccelerationUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<AngularAccelerationUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<AngularAccelerationUnit, AccelerationUnit<?>> divide(Acceleration<?>
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<AngularAccelerationUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Dimensionless divide(AngularAcceleration divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<AngularAccelerationUnit, AngularMomentumUnit> divide(AngularMomentum
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<AngularAccelerationUnit, AngularVelocityUnit> divide(AngularVelocity
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<AngularAccelerationUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default AngularAcceleration div(Dimensionless divisor) {
     return (AngularAcceleration) RadiansPerSecondPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<AngularAccelerationUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<AngularAccelerationUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<AngularAccelerationUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default AngularVelocity divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default AngularVelocity per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<AngularAccelerationUnit, LinearAccelerationUnit> divide(LinearAccele
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<AngularAccelerationUnit, LinearMomentumUnit> divide(LinearMomentum d
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<AngularAccelerationUnit, LinearVelocityUnit> divide(LinearVelocity d
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<AngularAccelerationUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<AngularAccelerationUnit, MomentOfInertiaUnit> divide(MomentOfInertia
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<AngularAccelerationUnit, MomentOfInertiaUnit> divide(MomentOfInertia
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<AngularAccelerationUnit, MomentOfInertiaUnit> divide(MomentOfInertia
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<AngularAccelerationUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<AngularAccelerationUnit, ResistanceUnit> divide(Resistance divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<AngularAccelerationUnit, TemperatureUnit> divide(Temperature divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularVelocity times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<AngularAccelerationUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<AngularAccelerationUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<AngularAccelerationUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<AngularAccelerationUnit, VelocityUnit<?>> divide(Velocity<?> divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularAccelerationUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<AngularAccelerationUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularAccelerationUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java
index 8d7bc6387e5..ab1b0f15fda 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java
@@ -87,11 +87,6 @@ default AngularMomentum divide(double divisor) {
     return (AngularMomentum) div(divisor);
   }
 
-  @Override
-  default Velocity<AngularMomentumUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<AngularMomentumUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<AngularMomentumUnit, AccelerationUnit<?>> divide(Acceleration<?> div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<AngularMomentumUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<AngularMomentumUnit, AngularAccelerationUnit> divide(AngularAccelera
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Dimensionless divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default MomentOfInertia divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default MomentOfInertia per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<AngularMomentumUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default AngularMomentum div(Dimensionless divisor) {
     return (AngularMomentum) KilogramMetersSquaredPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<AngularMomentumUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<AngularMomentumUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<AngularMomentumUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<AngularMomentumUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<AngularMomentumUnit, LinearAccelerationUnit> divide(LinearAccelerati
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<AngularMomentumUnit, LinearMomentumUnit> divide(LinearMomentum divis
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<AngularMomentumUnit, LinearVelocityUnit> divide(LinearVelocity divis
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<AngularMomentumUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<AngularMomentumUnit, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<AngularMomentumUnit, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<AngularMomentumUnit, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<AngularMomentumUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<AngularMomentumUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<AngularMomentumUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<AngularMomentumUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<AngularMomentumUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<AngularMomentumUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<AngularMomentumUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularMomentumUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<AngularMomentumUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularMomentumUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java
index 9347eafa8bc..37b4a28d574 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java
@@ -87,11 +87,6 @@ default AngularVelocity divide(double divisor) {
     return (AngularVelocity) div(divisor);
   }
 
-  @Override
-  default AngularAcceleration per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<AngularVelocityUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<AngularVelocityUnit, AccelerationUnit<?>> divide(Acceleration<?> div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<AngularVelocityUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<AngularVelocityUnit, AngularAccelerationUnit> divide(AngularAccelera
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<AngularVelocityUnit, AngularMomentumUnit> divide(AngularMomentum div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Dimensionless divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<AngularVelocityUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default AngularVelocity div(Dimensionless divisor) {
     return (AngularVelocity) RadiansPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<AngularVelocityUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<AngularVelocityUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<AngularVelocityUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularAcceleration times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<AngularVelocityUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<AngularVelocityUnit, LinearAccelerationUnit> divide(LinearAccelerati
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<AngularVelocityUnit, LinearMomentumUnit> divide(LinearMomentum divis
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<AngularVelocityUnit, LinearVelocityUnit> divide(LinearVelocity divis
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<AngularVelocityUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<AngularVelocityUnit, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<AngularVelocityUnit, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<AngularVelocityUnit, MomentOfInertiaUnit> divide(MomentOfInertia div
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<AngularVelocityUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<AngularVelocityUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<AngularVelocityUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Angle times(Time multiplier) {
@@ -597,6 +692,11 @@ default AngularAcceleration divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default AngularAcceleration per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<AngularVelocityUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<AngularVelocityUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<AngularVelocityUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<AngularVelocityUnit, VoltageUnit> times(Voltage multiplier) {
@@ -665,5 +775,10 @@ default Per<AngularVelocityUnit, VoltageUnit> div(Voltage divisor) {
   default Per<AngularVelocityUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
+
+  @Override
+  default Per<AngularVelocityUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
 default Frequency asFrequency() { return Hertz.of(baseUnitMagnitude()); }
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java
index 84ae1e04db1..734272a1380 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java
@@ -87,11 +87,6 @@ default Current divide(double divisor) {
     return (Current) div(divisor);
   }
 
-  @Override
-  default Velocity<CurrentUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<CurrentUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<CurrentUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<CurrentUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<CurrentUnit, AngularAccelerationUnit> divide(AngularAcceleration div
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<CurrentUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<CurrentUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Dimensionless divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Current div(Dimensionless divisor) {
     return (Current) Amps.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<CurrentUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<CurrentUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<CurrentUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<CurrentUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<CurrentUnit, LinearAccelerationUnit> divide(LinearAcceleration divis
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<CurrentUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<CurrentUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<CurrentUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<CurrentUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<CurrentUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<CurrentUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<CurrentUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<CurrentUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<CurrentUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Voltage times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<CurrentUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<CurrentUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<CurrentUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<CurrentUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<CurrentUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<CurrentUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<CurrentUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Power times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<CurrentUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<CurrentUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java
index 27e01a77a11..4447c270ee7 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java
@@ -87,11 +87,6 @@ default Dimensionless divide(double divisor) {
     return (Dimensionless) div(divisor);
   }
 
-  @Override
-  default Frequency per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<DimensionlessUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<DimensionlessUnit, AccelerationUnit<?>> divide(Acceleration<?> divis
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Angle times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<DimensionlessUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularAcceleration times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<DimensionlessUnit, AngularAccelerationUnit> divide(AngularAccelerati
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularMomentum times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<DimensionlessUnit, AngularMomentumUnit> divide(AngularMomentum divis
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularVelocity times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<DimensionlessUnit, AngularVelocityUnit> divide(AngularVelocity divis
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Current times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<DimensionlessUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Dimensionless div(Dimensionless divisor) {
     return (Dimensionless) Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<DimensionlessUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Energy times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<DimensionlessUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Force times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<DimensionlessUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Frequency times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<DimensionlessUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearAcceleration times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<DimensionlessUnit, LinearAccelerationUnit> divide(LinearAcceleration
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearMomentum times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<DimensionlessUnit, LinearMomentumUnit> divide(LinearMomentum divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearVelocity times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<DimensionlessUnit, LinearVelocityUnit> divide(LinearVelocity divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mass times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<DimensionlessUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default MomentOfInertia times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<DimensionlessUnit, MomentOfInertiaUnit> divide(MomentOfInertia divis
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DimensionlessUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<DimensionlessUnit, MomentOfInertiaUnit> divide(MomentOfInertia divis
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<DimensionlessUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<DimensionlessUnit, MomentOfInertiaUnit> divide(MomentOfInertia divis
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Power times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<DimensionlessUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Resistance times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<DimensionlessUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Temperature times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<DimensionlessUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Time times(Time multiplier) {
@@ -597,6 +692,11 @@ default Frequency divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Frequency per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Torque times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<DimensionlessUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DimensionlessUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<DimensionlessUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Voltage times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<DimensionlessUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DimensionlessUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java
index 7bfc52f736d..e0f53a620e2 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java
@@ -87,11 +87,6 @@ default Distance divide(double divisor) {
     return (Distance) div(divisor);
   }
 
-  @Override
-  default LinearVelocity per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<DistanceUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<DistanceUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<DistanceUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<DistanceUnit, AngularAccelerationUnit> divide(AngularAcceleration di
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<DistanceUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<DistanceUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<DistanceUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Distance div(Dimensionless divisor) {
     return (Distance) Meters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Dimensionless divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<DistanceUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Torque times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<DistanceUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearVelocity times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<DistanceUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<DistanceUnit, LinearAccelerationUnit> divide(LinearAcceleration divi
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<DistanceUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Time divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Time per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<DistanceUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<DistanceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<DistanceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<DistanceUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<DistanceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<DistanceUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<DistanceUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<DistanceUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<DistanceUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default LinearVelocity divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default LinearVelocity per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<DistanceUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<DistanceUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<DistanceUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<DistanceUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<DistanceUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java
index ed125befe33..a98f55d5a8d 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java
@@ -87,11 +87,6 @@ default Energy divide(double divisor) {
     return (Energy) div(divisor);
   }
 
-  @Override
-  default Power per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<EnergyUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<EnergyUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<EnergyUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<EnergyUnit, AngularAccelerationUnit> divide(AngularAcceleration divi
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<EnergyUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<EnergyUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<EnergyUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Energy div(Dimensionless divisor) {
     return (Energy) Joules.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<EnergyUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Dimensionless divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<EnergyUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Power times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<EnergyUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<EnergyUnit, LinearAccelerationUnit> divide(LinearAcceleration diviso
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<EnergyUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<EnergyUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<EnergyUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<EnergyUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<EnergyUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<EnergyUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<EnergyUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<EnergyUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<EnergyUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<EnergyUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<EnergyUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Power divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Power per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<EnergyUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<EnergyUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<EnergyUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<EnergyUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<EnergyUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java
index fa69b143f1a..02337428929 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java
@@ -87,11 +87,6 @@ default Force divide(double divisor) {
     return (Force) div(divisor);
   }
 
-  @Override
-  default Velocity<ForceUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<ForceUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<ForceUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<ForceUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<ForceUnit, AngularAccelerationUnit> divide(AngularAcceleration divis
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<ForceUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<ForceUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<ForceUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Force div(Dimensionless divisor) {
     return (Force) Newtons.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<ForceUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<ForceUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Dimensionless divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<ForceUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Mass divide(LinearAcceleration divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Mass per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<ForceUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<ForceUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default LinearAcceleration divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default LinearAcceleration per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<ForceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<ForceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<ForceUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<ForceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<ForceUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<ForceUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<ForceUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<ForceUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<ForceUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<ForceUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<ForceUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<ForceUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ForceUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<ForceUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ForceUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java
index 1b69009db5a..d18973a84d7 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java
@@ -87,11 +87,6 @@ default Frequency divide(double divisor) {
     return (Frequency) div(divisor);
   }
 
-  @Override
-  default Velocity<FrequencyUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<FrequencyUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<FrequencyUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularVelocity times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<FrequencyUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<FrequencyUnit, AngularAccelerationUnit> divide(AngularAcceleration d
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<FrequencyUnit, AngularMomentumUnit> divide(AngularMomentum divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularAcceleration times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<FrequencyUnit, AngularVelocityUnit> divide(AngularVelocity divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<FrequencyUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Frequency div(Dimensionless divisor) {
     return (Frequency) Hertz.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<FrequencyUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<FrequencyUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<FrequencyUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Dimensionless divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<FrequencyUnit, LinearAccelerationUnit> divide(LinearAcceleration div
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<FrequencyUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearAcceleration times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<FrequencyUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<FrequencyUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<FrequencyUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<FrequencyUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<FrequencyUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<FrequencyUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<FrequencyUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<FrequencyUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<FrequencyUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<FrequencyUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Dimensionless times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<FrequencyUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<FrequencyUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<FrequencyUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<FrequencyUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<FrequencyUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<FrequencyUnit, VoltageUnit> times(Voltage multiplier) {
@@ -665,6 +775,11 @@ default Per<FrequencyUnit, VoltageUnit> div(Voltage divisor) {
   default Per<FrequencyUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
+
+  @Override
+  default Per<FrequencyUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
 /** Converts this frequency to the time period between cycles. */
 default Time asPeriod() { return Seconds.of(1 / baseUnitMagnitude()); }
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java
index dc8f6d26b8a..875ef937b1a 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java
@@ -87,11 +87,6 @@ default LinearAcceleration divide(double divisor) {
     return (LinearAcceleration) div(divisor);
   }
 
-  @Override
-  default Velocity<LinearAccelerationUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<LinearAccelerationUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<LinearAccelerationUnit, AccelerationUnit<?>> divide(Acceleration<?>
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<LinearAccelerationUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<LinearAccelerationUnit, AngularAccelerationUnit> divide(AngularAccel
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<LinearAccelerationUnit, AngularMomentumUnit> divide(AngularMomentum
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<LinearAccelerationUnit, AngularVelocityUnit> divide(AngularVelocity
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<LinearAccelerationUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default LinearAcceleration div(Dimensionless divisor) {
     return (LinearAcceleration) MetersPerSecondPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<LinearAccelerationUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<LinearAccelerationUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<LinearAccelerationUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default LinearVelocity divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default LinearVelocity per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Dimensionless divide(LinearAcceleration divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<LinearAccelerationUnit, LinearMomentumUnit> divide(LinearMomentum di
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<LinearAccelerationUnit, LinearVelocityUnit> divide(LinearVelocity di
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<LinearAccelerationUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<LinearAccelerationUnit, MomentOfInertiaUnit> divide(MomentOfInertia
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<LinearAccelerationUnit, MomentOfInertiaUnit> divide(MomentOfInertia
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<LinearAccelerationUnit, MomentOfInertiaUnit> divide(MomentOfInertia
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<LinearAccelerationUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<LinearAccelerationUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<LinearAccelerationUnit, TemperatureUnit> divide(Temperature divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearVelocity times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<LinearAccelerationUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<LinearAccelerationUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<LinearAccelerationUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<LinearAccelerationUnit, VelocityUnit<?>> divide(Velocity<?> divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearAccelerationUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<LinearAccelerationUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearAccelerationUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java
index 2a7ce3341d1..c1bf6d7f117 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java
@@ -87,11 +87,6 @@ default LinearMomentum divide(double divisor) {
     return (LinearMomentum) div(divisor);
   }
 
-  @Override
-  default Force per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<LinearMomentumUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<LinearMomentumUnit, AccelerationUnit<?>> divide(Acceleration<?> divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<LinearMomentumUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<LinearMomentumUnit, AngularAccelerationUnit> divide(AngularAccelerat
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<LinearMomentumUnit, AngularMomentumUnit> divide(AngularMomentum divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<LinearMomentumUnit, AngularVelocityUnit> divide(AngularVelocity divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<LinearMomentumUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default LinearMomentum div(Dimensionless divisor) {
     return (LinearMomentum) KilogramMetersPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<LinearMomentumUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<LinearMomentumUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<LinearMomentumUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Force times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<LinearMomentumUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<LinearMomentumUnit, LinearAccelerationUnit> divide(LinearAcceleratio
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Dimensionless divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Mass divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Mass per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default LinearVelocity divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default LinearVelocity per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<LinearMomentumUnit, MomentOfInertiaUnit> divide(MomentOfInertia divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<LinearMomentumUnit, MomentOfInertiaUnit> divide(MomentOfInertia divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<LinearMomentumUnit, MomentOfInertiaUnit> divide(MomentOfInertia divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<LinearMomentumUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<LinearMomentumUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<LinearMomentumUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Force divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Force per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<LinearMomentumUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<LinearMomentumUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearMomentumUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<LinearMomentumUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearMomentumUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java
index e45aa5474ad..7ed8cc1e5f5 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java
@@ -87,11 +87,6 @@ default LinearVelocity divide(double divisor) {
     return (LinearVelocity) div(divisor);
   }
 
-  @Override
-  default LinearAcceleration per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<LinearVelocityUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<LinearVelocityUnit, AccelerationUnit<?>> divide(Acceleration<?> divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<LinearVelocityUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<LinearVelocityUnit, AngularAccelerationUnit> divide(AngularAccelerat
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<LinearVelocityUnit, AngularMomentumUnit> divide(AngularMomentum divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<LinearVelocityUnit, AngularVelocityUnit> divide(AngularVelocity divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<LinearVelocityUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default LinearVelocity div(Dimensionless divisor) {
     return (LinearVelocity) MetersPerSecond.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<LinearVelocityUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<LinearVelocityUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<LinearVelocityUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearAcceleration times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<LinearVelocityUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<LinearVelocityUnit, LinearAccelerationUnit> divide(LinearAcceleratio
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<LinearVelocityUnit, LinearMomentumUnit> divide(LinearMomentum diviso
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Dimensionless divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<LinearVelocityUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<LinearVelocityUnit, MomentOfInertiaUnit> divide(MomentOfInertia divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<LinearVelocityUnit, MomentOfInertiaUnit> divide(MomentOfInertia divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<LinearVelocityUnit, MomentOfInertiaUnit> divide(MomentOfInertia divi
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<LinearVelocityUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<LinearVelocityUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<LinearVelocityUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Distance times(Time multiplier) {
@@ -597,6 +692,11 @@ default LinearAcceleration divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default LinearAcceleration per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<LinearVelocityUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<LinearVelocityUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<LinearVelocityUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<LinearVelocityUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<LinearVelocityUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java
index 81a0f1507f1..507977df5c4 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java
@@ -87,11 +87,6 @@ default Mass divide(double divisor) {
     return (Mass) div(divisor);
   }
 
-  @Override
-  default Velocity<MassUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<MassUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<MassUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<MassUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<MassUnit, AngularAccelerationUnit> divide(AngularAcceleration diviso
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<MassUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<MassUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<MassUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Mass div(Dimensionless divisor) {
     return (Mass) Kilograms.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<MassUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<MassUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<MassUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<MassUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Force times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<MassUnit, LinearAccelerationUnit> divide(LinearAcceleration divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<MassUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<MassUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Dimensionless divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<MassUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<MassUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<MassUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<MassUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<MassUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<MassUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<MassUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<MassUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<MassUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<MassUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<MassUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<MassUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MassUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<MassUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MassUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java
index b831bcffc6b..21f04fbeb73 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java
@@ -87,11 +87,6 @@ default MomentOfInertia divide(double divisor) {
     return (MomentOfInertia) div(divisor);
   }
 
-  @Override
-  default Velocity<MomentOfInertiaUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<MomentOfInertiaUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<MomentOfInertiaUnit, AccelerationUnit<?>> divide(Acceleration<?> div
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<MomentOfInertiaUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<MomentOfInertiaUnit, AngularAccelerationUnit> divide(AngularAccelera
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<MomentOfInertiaUnit, AngularMomentumUnit> divide(AngularMomentum div
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularMomentum times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<MomentOfInertiaUnit, AngularVelocityUnit> divide(AngularVelocity div
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<MomentOfInertiaUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default MomentOfInertia div(Dimensionless divisor) {
     return (MomentOfInertia) KilogramSquareMeters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<MomentOfInertiaUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<MomentOfInertiaUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<MomentOfInertiaUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<MomentOfInertiaUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<MomentOfInertiaUnit, LinearAccelerationUnit> divide(LinearAccelerati
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<MomentOfInertiaUnit, LinearMomentumUnit> divide(LinearMomentum divis
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<MomentOfInertiaUnit, LinearVelocityUnit> divide(LinearVelocity divis
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<MomentOfInertiaUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Dimensionless divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Dimensionless divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Dimensionless divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<MomentOfInertiaUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<MomentOfInertiaUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<MomentOfInertiaUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<MomentOfInertiaUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<MomentOfInertiaUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<MomentOfInertiaUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<MomentOfInertiaUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MomentOfInertiaUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<MomentOfInertiaUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MomentOfInertiaUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java
index 3b7dcf840c9..5cee72363d6 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java
@@ -87,11 +87,6 @@ default Mult<A, B> divide(double divisor) {
     return (Mult<A, B>) div(divisor);
   }
 
-  @Override
-  default Velocity<MultUnit<A, B>> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<MultUnit<A, B>, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<MultUnit<A, B>, AccelerationUnit<?>> divide(Acceleration<?> divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<MultUnit<A, B>, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<MultUnit<A, B>, AngularAccelerationUnit> divide(AngularAcceleration
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<MultUnit<A, B>, AngularMomentumUnit> divide(AngularMomentum divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<MultUnit<A, B>, AngularVelocityUnit> divide(AngularVelocity divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<MultUnit<A, B>, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Mult<A, B> div(Dimensionless divisor) {
     return (Mult<A, B>) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<MultUnit<A, B>, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<MultUnit<A, B>, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<MultUnit<A, B>, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<MultUnit<A, B>, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<MultUnit<A, B>, LinearAccelerationUnit> divide(LinearAcceleration di
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<MultUnit<A, B>, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<MultUnit<A, B>, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<MultUnit<A, B>, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<MultUnit<A, B>, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<MultUnit<A, B>, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<MultUnit<A, B>, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<MultUnit<A, B>, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<MultUnit<A, B>, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<MultUnit<A, B>, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<MultUnit<A, B>> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<MultUnit<A, B>> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<MultUnit<A, B>, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<MultUnit<A, B>, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<MultUnit<A, B>, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<MultUnit<A, B>, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<MultUnit<A, B>, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java
index e46fb50f89b..2c1af67794d 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java
@@ -87,11 +87,6 @@ default Per<Dividend, Divisor> divide(double divisor) {
     return (Per<Dividend, Divisor>) div(divisor);
   }
 
-  @Override
-  default Velocity<PerUnit<Dividend, Divisor>> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<PerUnit<Dividend, Divisor>, AccelerationUnit<?>> divide(Acceleration
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<PerUnit<Dividend, Divisor>, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<PerUnit<Dividend, Divisor>, AngularAccelerationUnit> divide(AngularA
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<PerUnit<Dividend, Divisor>, AngularMomentumUnit> divide(AngularMomen
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<PerUnit<Dividend, Divisor>, AngularVelocityUnit> divide(AngularVeloc
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<PerUnit<Dividend, Divisor>, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Per<Dividend, Divisor> div(Dimensionless divisor) {
     return (Per<Dividend, Divisor>) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<PerUnit<Dividend, Divisor>, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<PerUnit<Dividend, Divisor>, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<PerUnit<Dividend, Divisor>, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<PerUnit<Dividend, Divisor>, FrequencyUnit> divide(Frequency divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<PerUnit<Dividend, Divisor>, LinearAccelerationUnit> divide(LinearAcc
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<PerUnit<Dividend, Divisor>, LinearMomentumUnit> divide(LinearMomentu
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<PerUnit<Dividend, Divisor>, LinearVelocityUnit> divide(LinearVelocit
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<PerUnit<Dividend, Divisor>, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<PerUnit<Dividend, Divisor>, MomentOfInertiaUnit> divide(MomentOfIner
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<PerUnit<Dividend, Divisor>, MomentOfInertiaUnit> divide(MomentOfIner
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<PerUnit<Dividend, Divisor>, MomentOfInertiaUnit> divide(MomentOfIner
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<PerUnit<Dividend, Divisor>, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<PerUnit<Dividend, Divisor>, ResistanceUnit> divide(Resistance diviso
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<PerUnit<Dividend, Divisor>, TemperatureUnit> divide(Temperature divi
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<PerUnit<Dividend, Divisor>> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<PerUnit<Dividend, Divisor>> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<PerUnit<Dividend, Divisor>, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<PerUnit<Dividend, Divisor>, VelocityUnit<?>> divide(Velocity<?> divi
     return div(divisor);
   }
 
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PerUnit<Dividend, Divisor>, VoltageUnit> times(Voltage multiplier) {
@@ -665,6 +775,11 @@ default Per<PerUnit<Dividend, Divisor>, VoltageUnit> div(Voltage divisor) {
   default Per<PerUnit<Dividend, Divisor>, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
+
+  @Override
+  default Per<PerUnit<Dividend, Divisor>, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
 default Measure<Dividend> timesDivisor(Measure<? extends Divisor> multiplier) {
   return (Measure<Dividend>) baseUnit().numerator().ofBaseUnits(baseUnitMagnitude() * multiplier.baseUnitMagnitude());
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java
index a666094881b..d94ddcde389 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java
@@ -87,11 +87,6 @@ default Power divide(double divisor) {
     return (Power) div(divisor);
   }
 
-  @Override
-  default Velocity<PowerUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<PowerUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<PowerUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<PowerUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<PowerUnit, AngularAccelerationUnit> divide(AngularAcceleration divis
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<PowerUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<PowerUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Voltage divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Voltage per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Power div(Dimensionless divisor) {
     return (Power) Watts.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<PowerUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Frequency divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Frequency per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<PowerUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<PowerUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<PowerUnit, LinearAccelerationUnit> divide(LinearAcceleration divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<PowerUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<PowerUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<PowerUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<PowerUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<PowerUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<PowerUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<PowerUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<PowerUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Dimensionless divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<PowerUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<PowerUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Energy times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<PowerUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<PowerUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<PowerUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<PowerUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<PowerUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<PowerUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Current divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Current per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java
index 28932b2c70b..52d15b091ae 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java
@@ -87,11 +87,6 @@ default Resistance divide(double divisor) {
     return (Resistance) div(divisor);
   }
 
-  @Override
-  default Velocity<ResistanceUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<ResistanceUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<ResistanceUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<ResistanceUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<ResistanceUnit, AngularAccelerationUnit> divide(AngularAcceleration
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<ResistanceUnit, AngularMomentumUnit> divide(AngularMomentum divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<ResistanceUnit, AngularVelocityUnit> divide(AngularVelocity divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Voltage times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<ResistanceUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Resistance div(Dimensionless divisor) {
     return (Resistance) Ohms.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<ResistanceUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<ResistanceUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<ResistanceUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<ResistanceUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<ResistanceUnit, LinearAccelerationUnit> divide(LinearAcceleration di
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<ResistanceUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<ResistanceUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<ResistanceUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<ResistanceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<ResistanceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<ResistanceUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<ResistanceUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<ResistanceUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<ResistanceUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Dimensionless divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<ResistanceUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<ResistanceUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<ResistanceUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<ResistanceUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<ResistanceUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<ResistanceUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<ResistanceUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<ResistanceUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java
index b10efd810d7..2d7983b8466 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java
@@ -87,11 +87,6 @@ default Temperature divide(double divisor) {
     return (Temperature) div(divisor);
   }
 
-  @Override
-  default Velocity<TemperatureUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<TemperatureUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<TemperatureUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<TemperatureUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<TemperatureUnit, AngularAccelerationUnit> divide(AngularAcceleration
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<TemperatureUnit, AngularMomentumUnit> divide(AngularMomentum divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<TemperatureUnit, AngularVelocityUnit> divide(AngularVelocity divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<TemperatureUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Temperature div(Dimensionless divisor) {
     return (Temperature) Kelvin.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<TemperatureUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<TemperatureUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<TemperatureUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<TemperatureUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<TemperatureUnit, LinearAccelerationUnit> divide(LinearAcceleration d
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<TemperatureUnit, LinearMomentumUnit> divide(LinearMomentum divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<TemperatureUnit, LinearVelocityUnit> divide(LinearVelocity divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<TemperatureUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<TemperatureUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<TemperatureUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<TemperatureUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<TemperatureUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<TemperatureUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<TemperatureUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<TemperatureUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Dimensionless divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<TemperatureUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<TemperatureUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<TemperatureUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<TemperatureUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TemperatureUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<TemperatureUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TemperatureUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java
index dccfda609d9..4244325a26e 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java
@@ -87,11 +87,6 @@ default Time divide(double divisor) {
     return (Time) div(divisor);
   }
 
-  @Override
-  default Dimensionless per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<TimeUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<TimeUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<TimeUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default AngularVelocity times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<TimeUnit, AngularAccelerationUnit> divide(AngularAcceleration diviso
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<TimeUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Angle times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<TimeUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<TimeUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Time div(Dimensionless divisor) {
     return (Time) Seconds.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<TimeUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<TimeUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<TimeUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Dimensionless times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<TimeUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default LinearVelocity times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<TimeUnit, LinearAccelerationUnit> divide(LinearAcceleration divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<TimeUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Distance times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<TimeUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<TimeUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<TimeUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<TimeUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<TimeUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<TimeUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<TimeUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<TimeUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<TimeUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<TimeUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Dimensionless divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<TimeUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<TimeUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TimeUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TimeUnit, VoltageUnit> times(Voltage multiplier) {
@@ -665,5 +775,10 @@ default Per<TimeUnit, VoltageUnit> div(Voltage divisor) {
   default Per<TimeUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
+
+  @Override
+  default Per<TimeUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
 default Frequency asFrequency() { return Hertz.of(1 / baseUnitMagnitude()); }
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java
index e53dbaad941..cc7ac69da57 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java
@@ -87,11 +87,6 @@ default Torque divide(double divisor) {
     return (Torque) div(divisor);
   }
 
-  @Override
-  default Velocity<TorqueUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<TorqueUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<TorqueUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<TorqueUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<TorqueUnit, AngularAccelerationUnit> divide(AngularAcceleration divi
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<TorqueUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<TorqueUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<TorqueUnit, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Torque div(Dimensionless divisor) {
     return (Torque) NewtonMeters.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Force divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Force per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<TorqueUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Distance divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Distance per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<TorqueUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<TorqueUnit, LinearAccelerationUnit> divide(LinearAcceleration diviso
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<TorqueUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<TorqueUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<TorqueUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<TorqueUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<TorqueUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<TorqueUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<TorqueUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<TorqueUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<TorqueUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<TorqueUnit, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<TorqueUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<TorqueUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<TorqueUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Dimensionless divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<TorqueUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<TorqueUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Per<TorqueUnit, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<TorqueUnit, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java
index 056924849e4..ac6df04e1f5 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java
@@ -87,11 +87,6 @@ default Velocity<D> divide(double divisor) {
     return (Velocity<D>) div(divisor);
   }
 
-  @Override
-  default Velocity<VelocityUnit<D>> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<VelocityUnit<D>, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<VelocityUnit<D>, AccelerationUnit<?>> divide(Acceleration<?> divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<VelocityUnit<D>, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<VelocityUnit<D>, AngularAccelerationUnit> divide(AngularAcceleration
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<VelocityUnit<D>, AngularMomentumUnit> divide(AngularMomentum divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<VelocityUnit<D>, AngularVelocityUnit> divide(AngularVelocity divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, CurrentUnit> times(Current multiplier) {
@@ -230,6 +250,11 @@ default Per<VelocityUnit<D>, CurrentUnit> divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, CurrentUnit> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Velocity<D> div(Dimensionless divisor) {
     return (Velocity<D>) unit().of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<VelocityUnit<D>, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<VelocityUnit<D>, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<VelocityUnit<D>, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<VelocityUnit<D>, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<VelocityUnit<D>, LinearAccelerationUnit> divide(LinearAcceleration d
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<VelocityUnit<D>, LinearMomentumUnit> divide(LinearMomentum divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<VelocityUnit<D>, LinearVelocityUnit> divide(LinearVelocity divisor)
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<VelocityUnit<D>, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<VelocityUnit<D>, MomentOfInertiaUnit> divide(MomentOfInertia divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<VelocityUnit<D>, MomentOfInertiaUnit> divide(MomentOfInertia divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<VelocityUnit<D>, MomentOfInertiaUnit> divide(MomentOfInertia divisor
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<VelocityUnit<D>, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Per<VelocityUnit<D>, ResistanceUnit> divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, ResistanceUnit> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<VelocityUnit<D>, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Measure<D> times(Time multiplier) {
     return (Measure<D>) unit().numerator().ofBaseUnits(baseUnitMagnitude() * multiplier.baseUnitMagnitude());
@@ -596,6 +691,11 @@ default Velocity<VelocityUnit<D>> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<VelocityUnit<D>> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, TorqueUnit> times(Torque multiplier) {
@@ -619,6 +719,11 @@ default Per<VelocityUnit<D>, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -642,6 +747,11 @@ default Per<VelocityUnit<D>, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VelocityUnit<D>, VoltageUnit> times(Voltage multiplier) {
@@ -665,4 +775,9 @@ default Per<VelocityUnit<D>, VoltageUnit> divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VelocityUnit<D>, VoltageUnit> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java
index 98ceecedaa0..33404865fdc 100644
--- a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java
+++ b/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java
@@ -87,11 +87,6 @@ default Voltage divide(double divisor) {
     return (Voltage) div(divisor);
   }
 
-  @Override
-  default Velocity<VoltageUnit> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
 
   @Override
   default Mult<VoltageUnit, AccelerationUnit<?>> times(Acceleration<?> multiplier) {
@@ -115,6 +110,11 @@ default Per<VoltageUnit, AccelerationUnit<?>> divide(Acceleration<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, AccelerationUnit<?>> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, AngleUnit> times(Angle multiplier) {
@@ -138,6 +138,11 @@ default Per<VoltageUnit, AngleUnit> divide(Angle divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, AngleUnit> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, AngularAccelerationUnit> times(AngularAcceleration multiplier) {
@@ -161,6 +166,11 @@ default Per<VoltageUnit, AngularAccelerationUnit> divide(AngularAcceleration div
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, AngularAccelerationUnit> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, AngularMomentumUnit> times(AngularMomentum multiplier) {
@@ -184,6 +194,11 @@ default Per<VoltageUnit, AngularMomentumUnit> divide(AngularMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, AngularMomentumUnit> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, AngularVelocityUnit> times(AngularVelocity multiplier) {
@@ -207,6 +222,11 @@ default Per<VoltageUnit, AngularVelocityUnit> divide(AngularVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, AngularVelocityUnit> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Power times(Current multiplier) {
@@ -230,6 +250,11 @@ default Resistance divide(Current divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Resistance per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   @Override
   default Voltage div(Dimensionless divisor) {
     return (Voltage) Volts.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
@@ -275,6 +300,11 @@ default Per<VoltageUnit, DistanceUnit> divide(Distance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, DistanceUnit> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, EnergyUnit> times(Energy multiplier) {
@@ -298,6 +328,11 @@ default Per<VoltageUnit, EnergyUnit> divide(Energy divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, EnergyUnit> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, ForceUnit> times(Force multiplier) {
@@ -321,6 +356,11 @@ default Per<VoltageUnit, ForceUnit> divide(Force divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, ForceUnit> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, FrequencyUnit> times(Frequency multiplier) {
@@ -344,6 +384,11 @@ default Per<VoltageUnit, FrequencyUnit> divide(Frequency divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, FrequencyUnit> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, LinearAccelerationUnit> times(LinearAcceleration multiplier) {
@@ -367,6 +412,11 @@ default Per<VoltageUnit, LinearAccelerationUnit> divide(LinearAcceleration divis
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, LinearAccelerationUnit> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, LinearMomentumUnit> times(LinearMomentum multiplier) {
@@ -390,6 +440,11 @@ default Per<VoltageUnit, LinearMomentumUnit> divide(LinearMomentum divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, LinearMomentumUnit> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, LinearVelocityUnit> times(LinearVelocity multiplier) {
@@ -413,6 +468,11 @@ default Per<VoltageUnit, LinearVelocityUnit> divide(LinearVelocity divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, LinearVelocityUnit> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, MassUnit> times(Mass multiplier) {
@@ -436,6 +496,11 @@ default Per<VoltageUnit, MassUnit> divide(Mass divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, MassUnit> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, MomentOfInertiaUnit> times(MomentOfInertia multiplier) {
@@ -459,6 +524,11 @@ default Per<VoltageUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, MomentOfInertiaUnit> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, MultUnit<?, ?>> times(Mult<?, ?> multiplier) {
@@ -482,6 +552,11 @@ default Per<VoltageUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, MultUnit<?, ?>> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<VoltageUnit, PerUnit<?, ?>> times(Per<?, ?> multiplier) {
@@ -505,6 +580,11 @@ default Per<VoltageUnit, MomentOfInertiaUnit> divide(MomentOfInertia divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, PerUnit<?, ?>> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.ofNative(1));
+  }
+
 
   @Override
   default Mult<VoltageUnit, PowerUnit> times(Power multiplier) {
@@ -528,6 +608,11 @@ default Per<VoltageUnit, PowerUnit> divide(Power divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, PowerUnit> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, ResistanceUnit> times(Resistance multiplier) {
@@ -551,6 +636,11 @@ default Current divide(Resistance divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Current per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, TemperatureUnit> times(Temperature multiplier) {
@@ -574,6 +664,11 @@ default Per<VoltageUnit, TemperatureUnit> divide(Temperature divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, TemperatureUnit> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, TimeUnit> times(Time multiplier) {
@@ -597,6 +692,11 @@ default Velocity<VoltageUnit> divide(Time divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Velocity<VoltageUnit> per(TimeUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, TorqueUnit> times(Torque multiplier) {
@@ -620,6 +720,11 @@ default Per<VoltageUnit, TorqueUnit> divide(Torque divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, TorqueUnit> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, VelocityUnit<?>> times(Velocity<?> multiplier) {
@@ -643,6 +748,11 @@ default Per<VoltageUnit, VelocityUnit<?>> divide(Velocity<?> divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Per<VoltageUnit, VelocityUnit<?>> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 
   @Override
   default Mult<VoltageUnit, VoltageUnit> times(Voltage multiplier) {
@@ -666,4 +776,9 @@ default Dimensionless divide(Voltage divisor) {
     return div(divisor);
   }
 
+  @Override
+  default Dimensionless per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
 }
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/Measure.java b/wpiunits/src/main/java/edu/wpi/first/units/Measure.java
index 28d6d9614a0..6a436194b7f 100644
--- a/wpiunits/src/main/java/edu/wpi/first/units/Measure.java
+++ b/wpiunits/src/main/java/edu/wpi/first/units/Measure.java
@@ -1021,6 +1021,270 @@ default Measure<?> div(Resistance divisor) {
         .ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
   }
 
+  /**
+   * Divides this measure by an acceleration unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(AccelerationUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by an angle unit and returns the result in the most appropriate unit. This
+   * is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(AngleUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by an angular acceleration unit and returns the result in the most
+   * appropriate unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(AngularAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by an angular momentum unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(AngularMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by an angular velocity unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(AngularVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a unit of electric current and returns the result in the most
+   * appropriate unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(CurrentUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a distance unit and returns the result in the most appropriate unit.
+   * This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(DistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by an energy unit and returns the result in the most appropriate unit.
+   * This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(EnergyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a force unit and returns the result in the most appropriate unit. This
+   * is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(ForceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a frequency unit and returns the result in the most appropriate unit.
+   * This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(FrequencyUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a linear acceleration unit and returns the result in the most
+   * appropriate unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(LinearAccelerationUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a linear momentum unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(LinearMomentumUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a linear velocity unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(LinearVelocityUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a mass unit and returns the result in the most appropriate unit. This
+   * is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(MassUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a moment of inertia unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(MomentOfInertiaUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a generic compound unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(MultUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a power unit and returns the result in the most appropriate unit. This
+   * is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(PowerUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a generic ratio unit and returns the result in the most appropriate
+   * unit. This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(PerUnit<?, ?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a temperature unit and returns the result in the most appropriate unit.
+   * This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(TemperatureUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a time period and returns the result in the most appropriate unit. This
+   * is equivalent to {@code div(period.of(1))}.
+   *
+   * @param period the time period measurement to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(TimeUnit period) {
+    return div(period.of(1));
+  }
+
+  /**
+   * Divides this measure by a torque unit and returns the result in the most appropriate unit. This
+   * is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(TorqueUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a velocity unit and returns the result in the most appropriate unit.
+   * This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(VelocityUnit<?> divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a voltage unit and returns the result in the most appropriate unit.
+   * This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(VoltageUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
+  /**
+   * Divides this measure by a resistance unit and returns the result in the most appropriate unit.
+   * This is equivalent to {@code div(divisorUnit.of(1))}.
+   *
+   * @param divisorUnit the unit to divide by.
+   * @return the division result
+   */
+  default Measure<?> per(ResistanceUnit divisorUnit) {
+    return div(divisorUnit.one());
+  }
+
   /**
    * Divides this measure by a unitless scalar and returns the result.
    *
@@ -1371,17 +1635,6 @@ default <Other extends Unit> Measure<Other> divideRatio(
         baseUnitMagnitude() / divisor.baseUnitMagnitude(), divisor.unit().denominator());
   }
 
-  /**
-   * Divides this measure by a time period and returns the result in the most appropriate unit. This
-   * is equivalent to {@code div(period.of(1))}.
-   *
-   * @param period the time period measurement to divide by.
-   * @return the division result
-   */
-  default Measure<?> per(TimeUnit period) {
-    return div(period.of(1));
-  }
-
   /**
    * Checks if this measure is near another measure of the same unit. Provide a variance threshold
    * for use for a +/- scalar, such as 0.05 for +/- 5%.
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/VelocityUnit.java b/wpiunits/src/main/java/edu/wpi/first/units/VelocityUnit.java
index d954166db4d..45374cd39cd 100644
--- a/wpiunits/src/main/java/edu/wpi/first/units/VelocityUnit.java
+++ b/wpiunits/src/main/java/edu/wpi/first/units/VelocityUnit.java
@@ -90,14 +90,14 @@ public Velocity<D> ofBaseUnits(double baseUnitMagnitude) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public Measure<? extends VelocityUnit<D>> zero() {
-    return (Measure<? extends VelocityUnit<D>>) super.zero();
+  public Velocity<D> zero() {
+    return (Velocity<D>) super.zero();
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public Measure<? extends VelocityUnit<D>> one() {
-    return (Measure<? extends VelocityUnit<D>>) super.one();
+  public Velocity<D> one() {
+    return (Velocity<D>) super.one();
   }
 
   @Override