diff --git a/.classpath b/.classpath
index 7c6ac24..81721b0 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="build/classes/java/main" path="src"/>
-	<classpathentry kind="src" output="build/classes/java/test" path="tests"/>
+	<classpathentry kind="src" output="bin/main" path="src">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="tests">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="src" path="/checker"/>
 	<classpathentry kind="src" path="/checker-framework-inference"/>
-	<classpathentry kind="lib" path="/checker-framework-inference/lib/com.microsoft.z3.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="/checker-framework-inference/dist/checker-framework-inference.jar"/>
-	<classpathentry kind="output" path="build/classes/java"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/.project b/.project
index 8ca7972..653f020 100644
--- a/.project
+++ b/.project
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>units-inference</name>
-	<projects/>
+	<comment></comment>
+	<projects>
+	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..e889521
--- /dev/null
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/annotated/Addition.java b/annotated/Addition.java
deleted file mode 100644
index 25cba68..0000000
--- a/annotated/Addition.java
+++ /dev/null
@@ -1,68 +0,0 @@
-import units.qual.m;
-import units.qual.Dimensionless;
-import units.qual.UnknownUnits;
-import units.qual.s;
-import units.qual.UnitsBottom;
-import units.UnitsTools;
-import units.qual.*;
-
-@Dimensionless
-class Addition {
-    @m int m = UnitsTools.m;
-    @s int s = UnitsTools.s;
-    @UnknownUnits int top;
-    @UnitsBottom int bot;
-
-    void tops(@Dimensionless Addition this) {
-        @UnknownUnits
-        int a = top + top;
-        @UnknownUnits
-        int b = top + bot;
-        @UnknownUnits
-        int c = bot + top;
-        @UnknownUnits
-        int d = top + m;
-        @UnknownUnits
-        int e = s + top;
-
-        // unsat cases:
-        // @m int ua = top + top;
-        // @m int ub = top + bot;
-        // @m int uc = bot + top;
-        // @m int ud = top + m;
-        // @m int ue = s + top;
-    }
-
-    void bots(@Dimensionless Addition this) {
-        @UnitsBottom
-        int a = bot + bot;
-        @m
-        int b = bot + m;
-        @s
-        int c = s + bot;
-    }
-
-    void units(@Dimensionless Addition this) {
-        @m
-        int a = m + m;
-        @UnknownUnits
-        double b = Math.PI + m;
-
-        // unsat cases:
-        // @s int ua = m + m;
-        // @s double ub = Math.PI + m;
-    }
-
-    void slots(@Dimensionless Addition this) {
-        @m
-        int a = m + m;
-        @m
-        int b = m + a;
-        @m
-        int c = a + m;
-        @m
-        int d = b + b;
-        @m
-        int e = b + c;
-    }
-}
diff --git a/annotated/Casting.java b/annotated/Casting.java
deleted file mode 100644
index 159aac9..0000000
--- a/annotated/Casting.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import units.qual.m;
-import units.qual.Dimensionless;
-import units.qual.*;
-
-@Dimensionless
-class Casting {
-    //    // :: fixable-error: (assignment.type.incompatible)
-    //    @m int primM2 = (int) 10.0f;
-    //    // :: fixable-error: (assignment.type.incompatible)
-    //    @s Integer primS = 30;
-    //
-    //    int primDim = (int) 20.0f;
-
-    @m
-    int boxDim = ((@m int) (20));
-    @m int boxM = (@m int) boxDim;
-
-    //    void cast() {
-    //    	int x = 20;
-    //    	@m int y = (@m int) x;
-    //
-    //    	Integer boxDim = 20;
-    //        @m Integer boxM = (@m Integer) boxDim;
-    //    }
-}
diff --git a/annotated/Conditional.java b/annotated/Conditional.java
deleted file mode 100644
index 97c2140..0000000
--- a/annotated/Conditional.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import units.qual.Dimensionless;
-import units.qual.*;
-
-@Dimensionless
-class Conditional<@Dimensionless T extends @Dimensionless RealFieldElement<@Dimensionless T>> {
-    public Conditional() {}
-
-    public @Dimensionless Conditional<T> compose(@Dimensionless Conditional<@Dimensionless T> this, final @Dimensionless boolean convention) {
-        return convention ? composeInternal() : applyTo();
-    }
-
-    private @Dimensionless Conditional<T> composeInternal(@Dimensionless Conditional<@Dimensionless T> this) {
-        return new @Dimensionless Conditional<>();
-    }
-
-    private <@Dimensionless T extends @Dimensionless RealFieldElement<@Dimensionless T>> @Dimensionless Conditional<T> applyTo(@Dimensionless Conditional<@Dimensionless T> this) {
-        return new @Dimensionless Conditional<>();
-    }
-}
diff --git a/annotated/Constructors.class b/annotated/Constructors.class
deleted file mode 100644
index a9c4999..0000000
Binary files a/annotated/Constructors.class and /dev/null differ
diff --git a/annotated/Constructors.java b/annotated/Constructors.java
deleted file mode 100644
index 8800d3c..0000000
--- a/annotated/Constructors.java
+++ /dev/null
@@ -1,46 +0,0 @@
-import units.qual.Dimensionless;
-import units.UnitsTools;
-import units.qual.*;
-
-@Dimensionless
-class PolyUnitClass {
-    @PolyUnit PolyUnitClass(@PolyUnit int x) {}
-}
-
-@Dimensionless
-class NoAnnotClass {
-    NoAnnotClass(@Dimensionless int x) {}
-}
-
-@Dimensionless
-class Constructors {
-    // TODO: return check isn't quite correct for inner declared classes
-
-//    void polyUnitConstructorTest() {
-//        // propagate @m from assignment context
-//        // :: fixable-error: (assignment.type.incompatible)
-//        @m PolyUnitClass puc1 = new PolyUnitClass(5);
-//
-//        // progagate @m from constructor arg
-//        PolyUnitClass puc2 = new PolyUnitClass(5 * UnitsTools.m);
-//
-//        // propagate @m from constructor return type
-//        // :: fixable-error: (constructor.invocation.invalid)
-//        PolyUnitClass puc3 = new @m PolyUnitClass(5);
-//
-//        // :: fixable-error: (constructor.invocation.invalid)
-//        @m PolyUnitClass puc4 = new @m PolyUnitClass(5);
-//
-//        // :: fixable-error: (constructor.invocation.invalid)
-//        PolyUnitClass puc5 = new @m PolyUnitClass(5 * UnitsTools.s);
-//    }
-
-    void nonPolyConstructorTest(@Dimensionless Constructors this) {
-        // :: fixable-error: (assignment.type.incompatible)
-//        @m Integer mc1 = new Integer(5);
-//        // :: fixable-error: (constructor.invocation.invalid)
-//        @m Integer mc2 = new @m Integer(5);
-
-        @Dimensionless NoAnnotClass na1 = new @Dimensionless NoAnnotClass(((@Dimensionless int) (5)));
-    }
-}
diff --git a/annotated/JavaUtilConcurrentTimeUnit.java b/annotated/JavaUtilConcurrentTimeUnit.java
deleted file mode 100644
index 95ee069..0000000
--- a/annotated/JavaUtilConcurrentTimeUnit.java
+++ /dev/null
@@ -1,76 +0,0 @@
-import units.qual.Dimensionless;
-import units.qual.ms;
-import units.qual.s;
-import units.qual.ns;
-import units.qual.us;
-import static java.util.concurrent.TimeUnit.*;
-
-import java.util.concurrent.TimeUnit;
-import units.qual.*;
-
-@Dimensionless
-class JavaUtilConcurrentTimeUnit {
-
-    void test(@Dimensionless JavaUtilConcurrentTimeUnit this, @Dimensionless long time, @Dimensionless TimeUnit unit) throws Exception {
-        @ms
-        long milliseconds = unit.toMillis(time);
-        Thread.sleep(milliseconds);
-    }
-
-    void test2(@Dimensionless JavaUtilConcurrentTimeUnit this) {
-        @s
-        TimeUnit s = TimeUnit.SECONDS;
-
-        @ms
-        TimeUnit ms = TimeUnit.MILLISECONDS;
-
-        @us
-        TimeUnit us = TimeUnit.MICROSECONDS;
-
-        @ns
-        TimeUnit ns = NANOSECONDS;
-
-        @s long seconds = s.convert(((@Dimensionless long) (10L)), NANOSECONDS);
-
-        // convert 10 minutes to milliseconds
-        @ms long milliseconds = ms.convert(((@Dimensionless long) (10L)), TimeUnit.MINUTES);
-
-        @us long microsec = us.convert(((@Dimensionless long) (10L)), TimeUnit.HOURS);
-
-        @ns long nanosec = ns.convert(((@Dimensionless long) (10L)), TimeUnit.DAYS);
-    }
-
-    void testParams(@Dimensionless JavaUtilConcurrentTimeUnit this) {
-        @s
-        TimeUnit s_unit = TimeUnit.SECONDS;
-        @ns
-        TimeUnit ns_unit = NANOSECONDS;
-
-        @ns
-        long ns = ((@ns int) (1000));
-        @s
-        long s = ((@s int) (1000));
-
-        // :: fixable-error: (argument.type.incompatible)
-        TimeUnit.SECONDS.toMillis(s);
-        // :: fixable-error: (argument.type.incompatible)
-        TimeUnit.NANOSECONDS.toMillis(ns);
-
-        // :: fixable-error: (argument.type.incompatible)
-        ns_unit.toMillis(ns);
-        // :: fixable-error: (argument.type.incompatible)
-        s_unit.toMillis(s);
-    }
-
-    void testReturn(@Dimensionless JavaUtilConcurrentTimeUnit this, @s long s1, @s long s2) {
-        @s
-        TimeUnit s = TimeUnit.SECONDS;
-        @ms
-        TimeUnit ms = TimeUnit.MILLISECONDS;
-
-        // :: fixable-error: (assignment.type.incompatible)
-        s1 = s.convert(((@Dimensionless long) (10L)), NANOSECONDS);
-        // :: fixable-error: (assignment.type.incompatible)
-        s2 = TimeUnit.SECONDS.convert(((@Dimensionless long) (10L)), NANOSECONDS);
-    }
-}
diff --git a/annotated/Methods.class b/annotated/Methods.class
deleted file mode 100644
index efa92f0..0000000
Binary files a/annotated/Methods.class and /dev/null differ
diff --git a/annotated/Methods.java b/annotated/Methods.java
deleted file mode 100644
index de4690e..0000000
--- a/annotated/Methods.java
+++ /dev/null
@@ -1,51 +0,0 @@
-import units.qual.Dimensionless;
-import units.qual.m;
-import units.UnitsTools;
-import units.qual.*;
-
-@Dimensionless
-class Methods {
-//    @PolyUnit int polyUnitMethod(@PolyUnit int x) {
-//        return x;
-//    }
-
-//    @PolyUnit int polyUnitMethod(@PolyUnit int x, @PolyUnit int y) {
-//        return x + y;
-//    }
-//
-//    @m int meterMethod(@m int x) {
-//        return x;
-//    }
-    
-    @m
-    int method(@Dimensionless Methods this) {
-        return ((@m int) (5));
-    }
-    
-    void testMethod(@Dimensionless Methods this) {
-    	// :: fixable-error: (assignment.type.incompatible)
-    	@m int num = method();
-    }
-
-//    void polyUnitMethodTest() {
-//        // :: fixable-error: (assignment.type.incompatible)
-//        @m int pum1 = polyUnitMethod(5);
-//
-////        @m int pum2 = polyUnitMethod(5 * UnitsTools.m);
-////
-////        // :: fixable-error: (assignment.type.incompatible)
-////        @m int pum3 = polyUnitMethod(5, 6);
-//    }
-
-//    void normalMethodTest() {
-//        // :: fixable-error: (argument.type.incompatible)
-//        int nm1 = meterMethod(5);
-//    }
-//
-//    void chainPolyUnitMethodTest() {
-//        // :: fixable-error: (assignment.type.incompatible)
-//        @m int cpum1 = polyUnitMethod(polyUnitMethod(5));
-//
-//        int cpum2 = polyUnitMethod(polyUnitMethod(5 * UnitsTools.m));
-//    }
-}
diff --git a/annotated/NoAnnotClass.class b/annotated/NoAnnotClass.class
deleted file mode 100644
index 5d66e4c..0000000
Binary files a/annotated/NoAnnotClass.class and /dev/null differ
diff --git a/annotated/PolyUnitClass.class b/annotated/PolyUnitClass.class
deleted file mode 100644
index 4c220d9..0000000
Binary files a/annotated/PolyUnitClass.class and /dev/null differ
diff --git a/annotated/RealFieldElement.java b/annotated/RealFieldElement.java
deleted file mode 100644
index bfa2b1e..0000000
--- a/annotated/RealFieldElement.java
+++ /dev/null
@@ -1,2 +0,0 @@
-import units.qual.Dimensionless;
-public interface RealFieldElement<@Dimensionless T extends @Dimensionless Object> {}
diff --git a/annotated/StaticFinalConstants.java b/annotated/StaticFinalConstants.java
deleted file mode 100644
index dd45ac9..0000000
--- a/annotated/StaticFinalConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import units.qual.rad;
-import units.qual.Dimensionless;
-import static java.lang.Math.*;
-
-import units.UnitsTools;
-import units.qual.*;
-
-@Dimensionless
-class StaticFinalConstants {
-
-    @Dimensionless
-    static class MyConstants {
-        public static final @Dimensionless double X = ((@Dimensionless int) (10));
-        public static final @rad Integer Y = ((@rad int) (Integer.MAX_VALUE));
-
-        public static final @rad int HASUNIT = ((@Dimensionless int) (20)) * UnitsTools.rad;
-
-        public MyConstants() {};
-    }
-
-    void inferRadians2(@Dimensionless StaticFinalConstants this) {
-        // :: fixable-error: (argument.type.incompatible)
-        sin(((@rad double) (MyConstants.X)));
-
-        // :: fixable-error: (argument.type.incompatible)
-        tan(MyConstants.Y);
-
-        cos(MyConstants.HASUNIT);
-    }
-}
diff --git a/annotated/Variables.java b/annotated/Variables.java
deleted file mode 100644
index 738639a..0000000
--- a/annotated/Variables.java
+++ /dev/null
@@ -1,79 +0,0 @@
-import units.qual.UnitsRep;
-import units.qual.Dimensionless;
-import units.qual.m;
-import units.qual.s;
-import units.qual.UnitsBottom;
-import units.UnitsTools;
-import units.qual.*;
-
-@Dimensionless
-class Variables {
-
-    // primitive fields
-    @UnknownUnits int puf = ((@Dimensionless int) (10));
-    @Dimensionless int pdf = ((@Dimensionless int) (30));
-
-    // :: fixable-error: (assignment.type.incompatible)
-    @m int pmf = ((@m int) (10));
-    // :: fixable-error: (assignment.type.incompatible)
-    @s int psf = ((@s int) (20));
-
-    void primitiveVars(@Dimensionless Variables this) {
-        @UnknownUnits int puv = ((@Dimensionless int) (10));
-        @Dimensionless int pdv = ((@Dimensionless int) (30));
-
-        // :: fixable-error: (assignment.type.incompatible)
-        @m int pmv = ((@m int) (10));
-        // :: fixable-error: (assignment.type.incompatible)
-        @s int psv = ((@s int) (20));
-    }
-
-    // boxed number fields
-    @UnknownUnits Integer buf = ((@Dimensionless int) (10));
-    @Dimensionless Integer bdf = ((@Dimensionless int) (20));
-    @UnitsBottom Integer bbf = null;
-    // :: fixable-error: (assignment.type.incompatible)
-    @m Integer bmf = ((@m int) (10));
-    // :: fixable-error: (assignment.type.incompatible)
-    @s Integer bsf = ((@s int) (20));
-
-    void boxedNumberVars(@Dimensionless Variables this) {
-        @UnknownUnits Integer buv = ((@Dimensionless int) (10));
-        @Dimensionless Integer bdv = ((@Dimensionless int) (20));
-        @UnitsBottom Integer bbv = ((@UnitsBottom Object) (null));
-        // :: fixable-error: (assignment.type.incompatible)
-        @m Integer bmv = ((@m int) (10));
-        // :: fixable-error: (assignment.type.incompatible)
-        @s Integer bsv = ((@s int) (20));
-    }
-
-    void boxedConstructorCalls(@Dimensionless Variables this) {
-        // :: fixable-error: (assignment.type.incompatible)
-        @m Integer implicitValueOfCall = ((@m int) (10));
-        // :: fixable-error: (assignment.type.incompatible)
-        @m Integer explicitValueOfCall = ((@m Integer) (Integer.valueOf(((@m int) (10)))));
-        // :: fixable-error: (constructor.invocation.invalid)
-        @m Integer omittingConstructorArgType = ((@Dimensionless Integer) (new @m Integer(((@Dimensionless int) (10)))));
-        @m Integer omittingConstructorReturnType = ((@Dimensionless Integer) (new @m Integer(((@UnitsRep(top=false, bot=false, prefixExponent=0, baseUnitComponents={@units.qual.BUC(unit="deg", exponent=0), @units.qual.BUC(unit="m", exponent=-1), @units.qual.BUC(unit="rad", exponent=0), @units.qual.BUC(unit="s", exponent=0)}) int) (10)) * UnitsTools.m)));
-        // :: fixable-error: (assignment.type.incompatible)
-        @m Integer omittingConstructorArgAndReturnType = ((@Dimensionless Integer) (new @m Integer(((@Dimensionless int) (10)))));
-    }
-
-    void boxedMethodCalls(@Dimensionless Variables this) {
-        // :: fixable-error: (assignment.type.incompatible)
-        @m Long staticPolyUnitMethod = ((@m long) (Integer.toUnsignedLong(((@m int) (10)))));
-    }
-
-    void customUnitForInsertion(@Dimensionless Variables this) {
-        @UnitsRep(
-                top = false,
-                bot = false,
-                prefixExponent = 4,
-                baseUnitComponents = {
-                    @BUC(unit = "m", exponent = 12),
-                    @BUC(unit = "s", exponent = -34)
-                })
-        // :: fixable-error: (assignment.type.incompatible)
-        Integer x = ((@UnitsRep(top=false, bot=false, prefixExponent=4, baseUnitComponents={@units.qual.BUC(unit="deg", exponent=0), @units.qual.BUC(unit="m", exponent=12), @units.qual.BUC(unit="rad", exponent=0), @units.qual.BUC(unit="s", exponent=-34)}) int) (50));
-    }
-}
diff --git a/benchmarks/find_replace.sh b/benchmarks/find_replace.sh
new file mode 100755
index 0000000..9ede210
--- /dev/null
+++ b/benchmarks/find_replace.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# find_replace.sh
+
+# echo "Find and replace in current directory!"
+# echo "Existing string?"
+# read existing
+# echo "Replacement string?"
+# read replacement
+# echo "Replacing all occurences of $existing with $replacement in files matching $filepattern"
+
+# find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/$existing/$replacement/g"
+
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/import si.uom.SI;/import units.UnitsTools;/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/SI.METRE/UnitsTools.m/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/SI.RADIAN/UnitsTools.rad/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/SI.SECOND/UnitsTools.s/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/SI.KILOMETER/UnitsTools.km/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/SI.DAY/UnitsTools.day/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/SI.YEAR/UnitsTools.year/g"
+
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/import si.uom.NonSI;/import units.UnitsTools;/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/NonSI.DEGREE_ANGLE/UnitsTools.deg/g"
+
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/import javax.measure.Unit;//g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/Unit<?>/int/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/Unit<Length>/int/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/Unit<Angle>/int/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/Unit<Time>/int/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/Unit<T>/int/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/Unit<Q>/int/g"
+find . -type f -name "*.java" -print0 | xargs -0 sed -i '' -e "s/Unit<Dimensionless>/int/g"
diff --git a/benchmarks/paper.yml b/benchmarks/paper.yml
new file mode 100644
index 0000000..30e5eef
--- /dev/null
+++ b/benchmarks/paper.yml
@@ -0,0 +1,39 @@
+paper:
+
+  exp4j:
+    giturl: https://github.com/jyluo-benchmarks/exp4j.git
+    build: mvn -B -DskipTests compile
+    clean: mvn -B clean
+
+  react:
+    giturl: https://github.com/jyluo-benchmarks/react.git
+    build: mvn -B -DskipTests compile
+    clean: mvn -B clean
+
+  jblas:
+    giturl: https://github.com/jyluo-benchmarks/jblas.git
+    # use more up to date https://github.com/mikiobraun/jblas.git in the future
+    build: mvn -B -DskipTests compile
+    clean: mvn -B clean
+
+  jReactPhysics3D:
+    giturl: https://github.com/jyluo-benchmarks/jReactPhysics3D.git
+    build: mvn -B -DskipTests compile
+    clean: mvn -B clean
+
+  # Unsat
+  JLargeArrays:
+    # giturl: https://gitlab.com/ICM-VisLab/JLargeArrays.git # this version would be nice to run on in the future, currently has typecheck errors
+    giturl: https://github.com/jyluo-benchmarks/JLargeArrays.git
+    build: mvn -B -DskipTests compile
+    clean: mvn -B clean
+  
+  imgscalr:
+    giturl: https://github.com/jyluo-benchmarks/imgscalr.git # try using latest from source?
+    build: mvn -B -DskipTests compile
+    clean: mvn -B clean
+
+  GasFlow:
+    giturl: https://github.com/txiang61-benchmarks/GasFlow.git
+    build: ant compile
+    clean: mvn -B clean
\ No newline at end of file
diff --git a/benchmarks/projects.yml b/benchmarks/projects.yml
index f311ca0..761a6ca 100644
--- a/benchmarks/projects.yml
+++ b/benchmarks/projects.yml
@@ -69,6 +69,12 @@ projects:
     build: mvn -B -DskipTests compile
     clean: mvn -B clean
 
+  # unsat, rerun with no stub for raw performance
+  josm:
+    giturl: https://github.com/txiang61-benchmarks/josm.git
+    build: ant compile
+    clean: ant clean
+
 # large size projects
   # crashes in CFI
   # spring-framework: #620859 LOC Java, requires gradle 4.10.3
@@ -82,6 +88,12 @@ projects:
   #   build: mvn -B -DskipTests compile -DskipTests
   #   clean: mvn -B clean
 
+  # Converted to use units
+  # GasFlow:
+  #   giturl: https://github.com/txiang61-benchmarks/GasFlow.git
+  #   build: ant jar
+  #   clean: mvn -B clean
+
 # Future test:
   # jscience: # does not build on its own
   #   giturl: https://github.com/jyluo-benchmarks/jscience.git
@@ -96,3 +108,8 @@ projects:
   #   giturl: https://github.com/jyluo-benchmarks/Facer.git
   #   build: ant
   #   clean: ant clean
+
+  # commons-math:
+  # giturl: https://github.com/txiang61-benchmarks/commons-math.git
+  # build: mvn install -Drat.numUnapprovedLicenses=100
+  # clean: mvn -B clean
diff --git a/build.gradle b/build.gradle
index 5ee9b84..1a7e3b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,6 @@ repositories {
 }
 
 ext {
-    assert JavaVersion.current() == JavaVersion.VERSION_1_8: "Set JAVA_HOME to JDK 8. Current version is ${JavaVersion.current()}"
     jsr308 = System.getenv('JSR308') ?: file(new File("..")).absolutePath
     cf = "${jsr308}/checker-framework"
     cfi = "${jsr308}/checker-framework-inference"
diff --git a/default.jaif b/default.jaif
deleted file mode 100644
index dacd04b..0000000
--- a/default.jaif
+++ /dev/null
@@ -1,97 +0,0 @@
-package units.qual:
-  annotation @us:
-
-package units.qual:
-  annotation @RDU:
-
-package units.qual:
-  annotation @m:
-
-package units.qual:
-  annotation @mPERs:
-
-package units.qual:
-  annotation @m2:
-
-package units.qual:
-  annotation @ms:
-
-package units.qual:
-  annotation @Dimensionless:
-
-package units.qual:
-  annotation @ns:
-
-package units.qual:
-  annotation @PolyUnit:
-
-package units.qual:
-  annotation @km:
-
-package units.qual:
-  annotation @BUC:
-    int exponent
-    String unit
-
-package units.qual:
-  annotation @UnitsRep:
-    boolean top
-    boolean bot
-    int prefixExponent
-    annotation-field units.qual.BUC[] baseUnitComponents
-
-package units.qual:
-  annotation @s:
-
-package units.qual:
-  annotation @rad:
-
-package units.qual:
-  annotation @UnitsBottom:
-
-package units.qual:
-  annotation @UnknownUnits:
-
-package units.qual:
-  annotation @deg:
-
-package :
-class JavaUtilConcurrentTimeUnit:@units.qual.Dimensionless
-method testReturn(JJ)V:
-insert-annotation Method.parameter 1, Variable.type: @units.qual.s
-insert-annotation Method.parameter -1: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 2, ExpressionStatement.expression, Assignment.expression, MethodInvocation.argument 0: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 3, ExpressionStatement.expression, Assignment.expression, MethodInvocation.argument 0: @units.qual.Dimensionless
-insert-annotation Method.parameter 0, Variable.type: @units.qual.s
-insert-annotation Method.body, Block.statement 0, Variable.type: @units.qual.s
-insert-annotation Method.body, Block.statement 1, Variable.type: @units.qual.ms
-
-method testParams()V:
-insert-annotation Method.body, Block.statement 0, Variable.type: @units.qual.s
-insert-annotation Method.body, Block.statement 1, Variable.type: @units.qual.ns
-insert-annotation Method.body, Block.statement 2, Variable.type: @units.qual.ns
-insert-annotation Method.body, Block.statement 3, Variable.type: @units.qual.s
-insert-annotation Method.parameter -1: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 2, Variable.initializer: @units.qual.ns
-insert-annotation Method.body, Block.statement 3, Variable.initializer: @units.qual.s
-
-method <init>()V:
-
-method test(JLjava/util/concurrent/TimeUnit;)V:
-insert-annotation Method.parameter 1, Variable.type: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 0, Variable.type: @units.qual.ms
-insert-annotation Method.parameter 0, Variable.type: @units.qual.Dimensionless
-insert-annotation Method.parameter -1: @units.qual.Dimensionless
-
-method test2()V:
-insert-annotation Method.parameter -1: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 0, Variable.type: @units.qual.s
-insert-annotation Method.body, Block.statement 1, Variable.type: @units.qual.ms
-insert-annotation Method.body, Block.statement 2, Variable.type: @units.qual.us
-insert-annotation Method.body, Block.statement 3, Variable.type: @units.qual.ns
-insert-annotation Method.body, Block.statement 4, Variable.initializer, MethodInvocation.argument 0: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 5, Variable.initializer, MethodInvocation.argument 0: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 6, Variable.initializer, MethodInvocation.argument 0: @units.qual.Dimensionless
-insert-annotation Method.body, Block.statement 7, Variable.initializer, MethodInvocation.argument 0: @units.qual.Dimensionless
-
-
diff --git a/scripts/run-dljc-infer.sh b/scripts/run-dljc-infer.sh
index 0b515c3..ca2cf4f 100755
--- a/scripts/run-dljc-infer.sh
+++ b/scripts/run-dljc-infer.sh
@@ -20,7 +20,7 @@ export LD_LIBRARY_PATH=$CFI_LIB
 
 CHECKER=units.UnitsChecker
 SOLVER=units.solvers.backend.UnitsSolverEngine
-# DEBUG_SOLVER=checkers.inference.solver.DebugSolver
+DEBUG_SOLVER=checkers.inference.solver.DebugSolver
 
 OPTIMIZINGMODE=$1
 shift
@@ -45,15 +45,15 @@ infer_cmd="python $DLJC/dljc -t inference --guess --crashExit \
 -o logs -m ROUNDTRIP -afud $WORKING_DIR/annotated -- $build_cmd "
 
 # debug_onlyCompile="--onlyCompileBytecodeBase true"
-# TODO:see how ontology uses testminimizer
-# debug_cmd="python $DLJC/dljc -t testminimizer --annotationClassPath $UIPATH \
-# $debug_onlyCompile --expectOutputRegex 'Unsatisfiable' --checker $CHECKER \
-# --solver $DEBUG_SOLVER --solverArgs=$SOLVERARGS \
-# -o logs -m INFER -afud $WORKING_DIR/annotated -- $build_cmd "
-debug_cmd="python $DLJC/dljc -t inference --guess --crashExit \
---checker $CHECKER --solver $DEBUG_SOLVER --solverArgs=$SOLVERARGS \
+debug_cmd="python $DLJC/dljc -t testminimizer --annotationClassPath $UIPATH \
+$debug_onlyCompile --expectOutputRegex 'Unsat Constraints' --checker $CHECKER \
+--solver $DEBUG_SOLVER --solverArgs=$SOLVERARGS \
 -o logs -m ROUNDTRIP -afud $WORKING_DIR/annotated -- $build_cmd "
 
+# debug_cmd="python $DLJC/dljc -t inference --guess --crashExit \
+# --checker $CHECKER --solver $DEBUG_SOLVER --solverArgs=$SOLVERARGS \
+# -o logs -m ROUNDTRIP -afud $WORKING_DIR/annotated -- $build_cmd "
+
 running_cmd=$infer_cmd
 
 echo "============ Important variables ============="
diff --git a/scripts/run-units-infer-on-corpus.py b/scripts/run-units-infer-on-corpus.py
index dedf5f8..6569bed 100644
--- a/scripts/run-units-infer-on-corpus.py
+++ b/scripts/run-units-infer-on-corpus.py
@@ -124,7 +124,7 @@ def main(argv):
 
     projects = None
     with open (os.path.join(UNITS_INFERENCE_DIR, "benchmarks", args.corpus_file)) as projects_file:
-        projects = yaml.load(projects_file)["projects"]
+        projects = yaml.load(projects_file)["paper"]
 
     for project_name, project_attrs in projects.iteritems():
         project_dir = os.path.join(BENCHMARK_DIR, project_name)
diff --git a/scripts/run-units-infer.sh b/scripts/run-units-infer.sh
index 78cc508..2fafdb0 100755
--- a/scripts/run-units-infer.sh
+++ b/scripts/run-units-infer.sh
@@ -24,7 +24,7 @@ fi
 
 IS_HACK=true
 
-export CLASSPATH=$UIPATH:.
+export CLASSPATH=$UIPATH:/home/txiang/jsr308-inference/checker-framework/checker/dist/checker.jar:/home/txiang/jsr308-inference/units-inference/benchmarks/projects/daikon/java/lib/units-inference.jar:/home/txiang/jsr308-inference/units-inference/benchmarks/projects/daikon/java/lib/checker-framework-inference.jar:/home/txiang/jsr308-inference/units-inference/benchmarks/projects/daikon/java/lib/*:/home/txiang/jsr308-inference/units-inference/benchmarks/projects/daikon/java:/usr/lib/jvm/java-8-openjdk-amd64/lib/tools.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar
 export external_checker_classpath=$UIPATH
 
 # NOTE: ROUNDTRIP mode actually writes out files to annotated, INFER mode only
diff --git a/scripts/run-units-typecheck-on-corpus.py b/scripts/run-units-typecheck-on-corpus.py
index c94c516..8441c58 100644
--- a/scripts/run-units-typecheck-on-corpus.py
+++ b/scripts/run-units-typecheck-on-corpus.py
@@ -30,7 +30,7 @@ def main(argv):
 
     projects = None
     with open (os.path.join(UNITS_INFERENCE_DIR, "benchmarks", args.corpus_file)) as projects_file:
-        projects = yaml.load(projects_file)["projects"]
+        projects = yaml.load(projects_file)["paper"]
 
     for project_name, project_attrs in projects.iteritems():
         project_dir = os.path.join(BENCHMARK_DIR, project_name)
diff --git a/solutions.txt b/solutions.txt
deleted file mode 100644
index b1d4f79..0000000
--- a/solutions.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-======================= Solutions =======================
-SlotID: 5   Annotation: @Dimensionless
-SlotID: 6   Annotation: @Dimensionless
-SlotID: 7   Annotation: @Dimensionless
-SlotID: 9   Annotation: @Dimensionless
-SlotID: 11  Annotation: @Dimensionless
-SlotID: 12  Annotation: @Dimensionless
-SlotID: 13  Annotation: @ms
-SlotID: 15  Annotation: @Dimensionless
-SlotID: 16  Annotation: @s
-SlotID: 18  Annotation: @ms
-SlotID: 19  Annotation: @us
-SlotID: 21  Annotation: @ns
-SlotID: 23  Annotation: @Dimensionless
-SlotID: 24  Annotation: @s
-SlotID: 25  Annotation: @Dimensionless
-SlotID: 26  Annotation: @ms
-SlotID: 27  Annotation: @Dimensionless
-SlotID: 28  Annotation: @us
-SlotID: 29  Annotation: @Dimensionless
-SlotID: 30  Annotation: @ns
-SlotID: 31  Annotation: @s
-SlotID: 32  Annotation: @ns
-SlotID: 33  Annotation: @ns
-SlotID: 34  Annotation: @ns
-SlotID: 35  Annotation: @s
-SlotID: 36  Annotation: @s
-SlotID: 37  Annotation: @s
-SlotID: 38  Annotation: @ns
-SlotID: 39  Annotation: @ns
-SlotID: 40  Annotation: @s
-SlotID: 41  Annotation: @s
-SlotID: 42  Annotation: @s
-SlotID: 43  Annotation: @s
-SlotID: 44  Annotation: @ms
-SlotID: 45  Annotation: @Dimensionless
-SlotID: 46  Annotation: @s
-SlotID: 47  Annotation: @s
-SlotID: 48  Annotation: @s
-SlotID: 49  Annotation: @Dimensionless
-SlotID: 50  Annotation: @s
-SlotID: 51  Annotation: @Dimensionless
-SlotID: 52  Annotation: @Dimensionless
-SlotID: 53  Annotation: @Dimensionless
-SlotID: 54  Annotation: @Dimensionless
-=========================================================
diff --git a/src/units/ApacheCommonsExec.astub b/src/units/ApacheCommonsExec.astub
new file mode 100644
index 0000000..111af3d
--- /dev/null
+++ b/src/units/ApacheCommonsExec.astub
@@ -0,0 +1,7 @@
+import units.qual.*;
+
+package org.apache.commons.exec;
+
+class ExecuteWatchdog {
+	ExecuteWatchdog(@ms long timeout);
+}
\ No newline at end of file
diff --git a/src/units/DaikonExprPlumelib.astub b/src/units/DaikonExprPlumelib.astub
new file mode 100644
index 0000000..83e4ff6
--- /dev/null
+++ b/src/units/DaikonExprPlumelib.astub
@@ -0,0 +1,7 @@
+import units.qual.*;
+
+package daikon.plumelib.bcelutil;
+
+final class SimpleLog {
+    void log(@UnknownUnits String s, @UnknownUnits Object... obj);
+}
\ No newline at end of file
diff --git a/src/units/JavaAWT.astub b/src/units/JavaAWT.astub
new file mode 100644
index 0000000..143afb9
--- /dev/null
+++ b/src/units/JavaAWT.astub
@@ -0,0 +1,8 @@
+import units.qual.*;
+
+package java.awt;
+
+abstract class Graphics2D {
+	abstract void rotate(@rad double theta);
+	abstract void rotate(@rad double theta, double x, double y);
+}
diff --git a/src/units/JavaAWTGeom.astub b/src/units/JavaAWTGeom.astub
new file mode 100644
index 0000000..b43b77d
--- /dev/null
+++ b/src/units/JavaAWTGeom.astub
@@ -0,0 +1,12 @@
+import units.qual.*;
+
+package java.awt.geom;
+
+class AffineTransform implements Cloneable, Serializable {
+	static AffineTransform getRotateInstance(@rad double theta);
+	static AffineTransform getRotateInstance(@rad double theta, double anchorx, double anchory);
+	void rotate(@rad double theta);
+	void rotate(@rad double theta, double x, double y);
+	void setToRotation(@rad double theta);
+	void setToRotation(@rad double theta, double anchorx, double anchory);
+}
diff --git a/src/units/JavaLang.astub b/src/units/JavaLang.astub
index 055fe6d..531edc9 100644
--- a/src/units/JavaLang.astub
+++ b/src/units/JavaLang.astub
@@ -6,14 +6,12 @@ class System {
     static @ms long currentTimeMillis();
     static @ns long nanoTime();
 }
-
 // Throwable is implicitly @UnknownUnits
 class Throwable implements Serializable {
     void printStackTrace(@UnknownUnits Throwable this);
     void printStackTrace(@UnknownUnits Throwable this, PrintStream arg0);
     void printStackTrace(@UnknownUnits Throwable this, PrintWriter arg0);
 }
-
 class String implements Serializable, Comparable<String>, CharSequence {
     static String format(String arg0, @UnknownUnits Object[] arg1);
     static String format(Locale arg0, String arg1, @UnknownUnits Object[] arg2);
@@ -22,3 +20,15 @@ class String implements Serializable, Comparable<String>, CharSequence {
     static String valueOf(@UnknownUnits float arg0);
     static String valueOf(@UnknownUnits double arg0);
 }
+
+class StringBuilder implements Serializable, CharSequence {
+    StringBuilder append(@UnknownUnits int i);
+    StringBuilder append(@UnknownUnits long lng);
+    StringBuilder append(@UnknownUnits float f);
+    StringBuilder append(@UnknownUnits double b);
+    StringBuilder append(@UnknownUnits char c);
+    StringBuilder append(@UnknownUnits char[] str);
+    StringBuilder append(@UnknownUnits String str);
+    StringBuilder append(@UnknownUnits Object obj);
+}
+
diff --git a/src/units/JavaNioFile.astub b/src/units/JavaNioFile.astub
new file mode 100644
index 0000000..69bb8bd
--- /dev/null
+++ b/src/units/JavaNioFile.astub
@@ -0,0 +1,8 @@
+import units.qual.*;
+
+package java.nio.file;
+
+interface Path {
+	File toFile(@UnknownUnits Path this);
+	File toString(@UnknownUnits Path this);
+}
diff --git a/src/units/JavaText.astub b/src/units/JavaText.astub
new file mode 100644
index 0000000..039e3d0
--- /dev/null
+++ b/src/units/JavaText.astub
@@ -0,0 +1,10 @@
+import units.qual.*;
+
+package java.text;
+
+class NumberFormat {
+    String format(@UnknownUnits long number);
+    abstract StrinBuffer format(@UnknownUnits long number, StringBuffer toAppendTo, FieldPosition pos);
+    String format(@UnknownUnits double number);
+    abstract StrinBuffer format(@UnknownUnits double number, StringBuffer toAppendTo, FieldPosition pos);
+}
diff --git a/src/units/JavaUtil.astub b/src/units/JavaUtil.astub
index d7bcb2d..1b23daf 100644
--- a/src/units/JavaUtil.astub
+++ b/src/units/JavaUtil.astub
@@ -23,3 +23,13 @@ class Random implements Serializable {
     Random(@UnknownUnits long arg0);
     void setSeed(@UnknownUnits long arg0);
 }
+
+class Arrays {
+    static void fill(@UnknownUnits int[] a, @UnknownUnits int val);
+    static void fill(@UnknownUnits short[] a, @UnknownUnits short val);
+    static void fill(@UnknownUnits long[] a, @UnknownUnits long val);
+    static void fill(@UnknownUnits float[] a, @UnknownUnits float val);
+    static void fill(@UnknownUnits double[] a, @UnknownUnits double val);
+    static String deepToString(@UnknownUnits Object[] a);
+}
+
diff --git a/src/units/JavaUtilConcurrent.astub b/src/units/JavaUtilConcurrent.astub
index 2e907d9..e1905e9 100644
--- a/src/units/JavaUtilConcurrent.astub
+++ b/src/units/JavaUtilConcurrent.astub
@@ -14,23 +14,22 @@ enum TimeUnit {
     // For example, to convert 10 minutes to milliseconds, use:
     // TimeUnit.MILLISECONDS.convert(10L, TimeUnit.MINUTES)
     // TODO: enforce source value and unit are equal
-    @PolyUnit long convert(@PolyUnit TimeUnit this, @UnknownUnits long sourceDuration,
-            @UnknownUnits TimeUnit sourceUnit);
+    @RDU long convert(@UnknownUnits TimeUnit this, @UnknownUnits long sourceDuration, @UnknownUnits TimeUnit sourceUnit);
 
     // TODO: add dimensional bound on duration to be a time value
-    @ns long toNanos(@UnknownUnits long duration);
+    @ns long toNanos(@UnknownUnits TimeUnit this, @RDU long duration);
 
-    @us long toMicros(@UnknownUnits long duration);
+    @us long toMicros(@UnknownUnits TimeUnit this, @RDU long duration);
 
-    @ms long toMillis(@UnknownUnits long duration);
+    @ms long toMillis(@UnknownUnits TimeUnit this, @RDU long duration);
 
-    @s long toSeconds(@UnknownUnits long duration);
+    @s long toSeconds(@UnknownUnits TimeUnit this, @RDU long duration);
 
-    long toMinutes(@UnknownUnits long duration);
+    long toMinutes(@UnknownUnits TimeUnit this, @RDU long duration);
 
-    long toHours(@UnknownUnits long duration);
+    long toHours(@UnknownUnits TimeUnit this, @RDU long duration);
 
-    long toDays(@UnknownUnits long duration);
+    long toDays(@UnknownUnits TimeUnit this, @RDU long duration);
 
     // TODO: enforce "this" has same unit as "timeout"
     void timedWait(@UnknownUnits TimeUnit this, Object obj, @UnknownUnits long timeout);
diff --git a/src/units/JavolutionMathLib.astub b/src/units/JavolutionMathLib.astub
new file mode 100644
index 0000000..a9ebd36
--- /dev/null
+++ b/src/units/JavolutionMathLib.astub
@@ -0,0 +1,89 @@
+import units.qual.*;
+
+package javolution.lang;
+
+final class MathLib {
+	// Scalar Constants
+    static final @Dimensionless double E;
+    static final @Dimensionless double PI;
+    static final @UnitsBottom double NaN;
+
+    // Methods ========
+
+    // Absolute Val
+    static @PolyUnit double abs(@PolyUnit double a);
+    static @PolyUnit float abs(@PolyUnit float a);
+    static @PolyUnit int abs(@PolyUnit int a);
+    static @PolyUnit long abs(@PolyUnit long a);
+
+    // Inverse Trigonometry
+    static @rad double asin(@Dimensionless double a);
+    static @rad double acos(@Dimensionless double a);
+    static @rad double atan(@Dimensionless double a);
+    static @rad double atan2(@UnknownUnits double y, @UnknownUnits double x);
+
+    // Trigonometry
+    static @Dimensionless double sin(@rad double a);
+    static @Dimensionless double cos(@rad double a);
+    static @Dimensionless double tan(@rad double a);
+    
+    // Hyperbolic Trigonometry
+    // takes as input a hyperbolic angle which is also in radians for Math lib
+    // implementation
+    static @Dimensionless double sinh(@rad double x);
+    static @Dimensionless double cosh(@rad double x);
+    static @Dimensionless double tanh(@rad double x);
+
+    // Angle Conversion
+    static @deg double toDegrees(@rad double angrad);
+    static @rad double toRadians(@deg double angdeg);
+
+    // Units Checker code has special support for these 2 methods, which will
+    // return the square root and cubic root of any supported units eg m2, km3
+    // if the user wants to take the square root of just the magnitude without
+    // affecting the unit, then they can surpress the warning
+    // TODO: special support in inference
+    static @UnitsBottom double sqrt(@UnknownUnits double a);
+    static @UnitsBottom double cbrt(@UnknownUnits double a);
+
+    static @PolyUnit double ceil(@PolyUnit double a);
+    static @PolyUnit double floor(@PolyUnit double a);
+
+    // powers, exponents, and logarithms
+    // returns the value of a ^ b, for specific cases of a having the units of
+    // m, mm, and km we return m2, mm2, and km2, for everything else we return
+    // UnknownUnits
+    // TODO: special support in inference
+    static @UnitsBottom double pow(@UnknownUnits double a, @UnknownUnits double b);
+
+    // calculates e^a == e * e * e .... which is a unitless scalar
+    static double exp(@UnknownUnits double a);
+
+    // log[a] = y where e^y = a, unitless?, this is log with base e
+    static double log(@UnknownUnits double a);
+    // log with base 10, log10[x] = y where 10^y = x
+    static double log10(@UnknownUnits double a);
+
+    // Future TODO: support retainment of units in these identifies
+    // identity: exp(log(a)) == a
+    // identity: log(exp(x)) == x
+
+    // min and max
+    // both x & y should be the same unit, if so returns that unit, otherwise
+    // returns the LUB of the 2 units
+    static @PolyUnit double max(@PolyUnit double a, @PolyUnit double b);
+    static @PolyUnit float max(@PolyUnit float a, @PolyUnit float b);
+    static @PolyUnit int max(@PolyUnit int a, @PolyUnit int b);
+    static @PolyUnit long max(@PolyUnit long a, @PolyUnit long b);
+
+    // both x & y should be the same unit, if so returns that unit, otherwise
+    // returns the LUB of the 2 units
+    static @PolyUnit double min(@PolyUnit double a, @PolyUnit double b);
+    static @PolyUnit float min(@PolyUnit float a, @PolyUnit float b);
+    static @PolyUnit int min(@PolyUnit int a, @PolyUnit int b);
+    static @PolyUnit long min(@PolyUnit long a, @PolyUnit long b);
+
+    // same unit as a
+    static @PolyUnit long round(@PolyUnit double a);
+    static @PolyUnit int round(@PolyUnit float a);
+}
\ No newline at end of file
diff --git a/src/units/UnitsAnnotatedTypeFactory.java b/src/units/UnitsAnnotatedTypeFactory.java
index 35600d7..359932d 100644
--- a/src/units/UnitsAnnotatedTypeFactory.java
+++ b/src/units/UnitsAnnotatedTypeFactory.java
@@ -19,7 +19,9 @@
 import org.checkerframework.framework.type.AnnotationClassLoader;
 import org.checkerframework.framework.type.DefaultAnnotatedTypeFormatter;
 import org.checkerframework.framework.type.QualifierHierarchy;
+import org.checkerframework.framework.type.ViewpointAdapter;
 import org.checkerframework.framework.type.treeannotator.ListTreeAnnotator;
+import org.checkerframework.framework.type.treeannotator.LiteralTreeAnnotator;
 import org.checkerframework.framework.type.treeannotator.PropagationTreeAnnotator;
 import org.checkerframework.framework.type.treeannotator.TreeAnnotator;
 import org.checkerframework.framework.type.typeannotator.DefaultForTypeAnnotator;
@@ -79,6 +81,11 @@ protected Set<Class<? extends Annotation>> createSupportedTypeQualifiers() {
         return qualSet;
     }
 
+    @Override
+    protected ViewpointAdapter createViewpointAdapter() {
+        return new UnitsViewpointAdapter(this);
+    }
+
     @Override
     public AnnotationMirror canonicalAnnotation(AnnotationMirror anno) {
         // check to see if it is an internal units annotation
@@ -111,7 +118,7 @@ public AnnotationMirror canonicalAnnotation(AnnotationMirror anno) {
     @Override
     public boolean isSupportedQualifier(AnnotationMirror anno) {
         /*
-         * getQualifierHierarchy().getTypeQualifiers() contains PolyAll, PolyUnit, and the AMs of
+         * getQualifierHierarchy().getTypeQualifiers() contains PolyUnit, and the AMs of
          * Top and Bottom. We need to check all other instances of @UnitsRep AMs that are
          * supported qualifiers here.
          */
@@ -121,8 +128,8 @@ public boolean isSupportedQualifier(AnnotationMirror anno) {
         if (AnnotationUtils.areSameByClass(anno, UnitsRep.class)) {
             return unitsRepUtils.hasAllBaseUnits(anno);
         }
-        // Anno is PolyAll, PolyUnit
-        return AnnotationUtils.containsSame(this.getQualifierHierarchy().getTypeQualifiers(), anno);
+        // Anno is PolyUnit
+        return getSupportedTypeQualifierNames().contains(anno.toString());
     }
 
     // Programmatically set the qualifier defaults
@@ -135,7 +142,8 @@ protected void addCheckedCodeDefaults(QualifierDefaults defs) {
         // defs.addCheckedCodeDefault(unitsRepUtils.DIMENSIONLESS, TypeUseLocation.UPPER_BOUND);
         defs.addCheckedCodeDefault(
                 unitsRepUtils.DIMENSIONLESS, TypeUseLocation.EXPLICIT_UPPER_BOUND);
-        defs.addCheckedCodeDefault(unitsRepUtils.TOP, TypeUseLocation.IMPLICIT_UPPER_BOUND);
+        defs.addCheckedCodeDefault(
+                unitsRepUtils.DIMENSIONLESS, TypeUseLocation.IMPLICIT_UPPER_BOUND);
         // defaults for lower bounds is BOTTOM, individual bounds can be manually set
         defs.addCheckedCodeDefault(unitsRepUtils.BOTTOM, TypeUseLocation.LOWER_BOUND);
         // exceptions are always dimensionless
@@ -239,6 +247,7 @@ protected void finish(
 
             // Update tops
             tops.remove(unitsRepUtils.RAWUNITSREP);
+            tops.remove(unitsRepUtils.RECEIVER_DEPENDANT_UNIT);
             tops.add(unitsRepUtils.TOP);
 
             // System.err.println(" === Typecheck ATF ");
@@ -284,6 +293,14 @@ public boolean isSubtype(AnnotationMirror subAnno, AnnotationMirror superAnno) {
                 return true;
             }
 
+            // Case: @RDU shouldn't appear. throw error?
+            if (AnnotationUtils.areSame(subAnno, unitsRepUtils.RECEIVER_DEPENDANT_UNIT)) {
+                return isSubtype(unitsRepUtils.TOP, superAnno);
+            }
+            if (AnnotationUtils.areSame(superAnno, unitsRepUtils.RECEIVER_DEPENDANT_UNIT)) {
+                return true;
+            }
+
             // Case: @UnitsRep(x) <: @UnitsRep(y)
             if (AnnotationUtils.areSameByClass(subAnno, UnitsRep.class)
                     && AnnotationUtils.areSameByClass(superAnno, UnitsRep.class)) {
@@ -312,13 +329,18 @@ public boolean isSubtype(AnnotationMirror subAnno, AnnotationMirror superAnno) {
     @Override
     public TreeAnnotator createTreeAnnotator() {
         return new ListTreeAnnotator(
-                new UnitsTypecheckLiteralTreeAnnotator(), new UnitsPropagationTreeAnnotator());
+                new UnitsLiteralTreeAnnotator(this), new UnitsPropagationTreeAnnotator());
     }
 
-    protected final class UnitsTypecheckLiteralTreeAnnotator extends UnitsLiteralTreeAnnotator {
+    protected final class UnitsLiteralTreeAnnotator extends LiteralTreeAnnotator {
         // Programmatically set the qualifier implicits
-        public UnitsTypecheckLiteralTreeAnnotator() {
-            super(UnitsAnnotatedTypeFactory.this);
+        public UnitsLiteralTreeAnnotator(AnnotatedTypeFactory atf) {
+            super(atf);
+            // set BOTTOM as the literal qualifier for null literals
+            addLiteralKind(LiteralKind.NULL, unitsRepUtils.BOTTOM);
+            addLiteralKind(LiteralKind.STRING, unitsRepUtils.DIMENSIONLESS);
+            addLiteralKind(LiteralKind.CHAR, unitsRepUtils.DIMENSIONLESS);
+            addLiteralKind(LiteralKind.BOOLEAN, unitsRepUtils.DIMENSIONLESS);
             // in type checking mode, we also set dimensionless for the number literals
             addLiteralKind(LiteralKind.INT, unitsRepUtils.DIMENSIONLESS);
             addLiteralKind(LiteralKind.LONG, unitsRepUtils.DIMENSIONLESS);
diff --git a/src/units/UnitsAnnotationFormatter.java b/src/units/UnitsAnnotationFormatter.java
index acd67fb..0e253a8 100644
--- a/src/units/UnitsAnnotationFormatter.java
+++ b/src/units/UnitsAnnotationFormatter.java
@@ -44,6 +44,7 @@ protected void formatAnnotationMirrorArg(AnnotationValue av, StringBuilder sb) {
             VariableElement ve = (VariableElement) val;
             sb.append(ve.getEnclosingElement().getSimpleName() + "." + ve.getSimpleName());
         } else if (val instanceof AnnotationMirror) {
+            sb.append(av.toString());
             // this is the new case added
             // if the argument is an AnnotationMirror, then recursively format the AnnotationMirror
             formatAnnotationMirror((AnnotationMirror) val, sb);
diff --git a/src/units/UnitsChecker.java b/src/units/UnitsChecker.java
index 7d2e1d7..af83daf 100644
--- a/src/units/UnitsChecker.java
+++ b/src/units/UnitsChecker.java
@@ -19,8 +19,15 @@
     "JavaMathTrig.astub",
     "JavaThread.astub",
     "JavaUtil.astub",
+    "JavaText.astub",
+    "JavaNioFile.astub",
+    "JavolutionMathLib.astub",
+    "ApacheCommonsExec.astub",
+    "DaikonExprPlumelib.astub", // for daikon expr
     "JavaUtilConcurrent.astub", // for ode4j, not yet annotated for hombucha
-    "ExperimentsJavaAwtGeomAffineTransform.astub", // for imgscalr experiment
+    "JavaAWT.astub", // for josm
+    "JavaAWTGeom.astub", // for josm, imgscalr
+    //    "ExperimentsJavaAwtGeomAffineTransform.astub", // for imgscalr experiment
     "ExperimentsSunMiscUnsafe.astub", // for JLargeArrays
 })
 public class UnitsChecker extends BaseInferrableChecker {
diff --git a/src/units/UnitsInferenceAnnotatedTypeFactory.java b/src/units/UnitsInferenceAnnotatedTypeFactory.java
index 484ef03..6a4ab80 100644
--- a/src/units/UnitsInferenceAnnotatedTypeFactory.java
+++ b/src/units/UnitsInferenceAnnotatedTypeFactory.java
@@ -2,6 +2,7 @@
 
 import checkers.inference.InferenceAnnotatedTypeFactory;
 import checkers.inference.InferenceChecker;
+import checkers.inference.InferenceMain;
 import checkers.inference.InferenceQualifierHierarchy;
 import checkers.inference.InferenceTreeAnnotator;
 import checkers.inference.InferrableChecker;
@@ -12,14 +13,18 @@
 import checkers.inference.model.ConstraintManager;
 import checkers.inference.model.Slot;
 import checkers.inference.model.VariableSlot;
+import checkers.inference.qual.VarAnnot;
+import checkers.inference.util.InferenceViewpointAdapter;
 import com.sun.source.tree.BinaryTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.IdentifierTree;
+import com.sun.source.tree.LiteralTree;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.Tree;
 import java.lang.annotation.Annotation;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -40,6 +45,7 @@
 import org.checkerframework.framework.util.AnnotatedTypes;
 import org.checkerframework.framework.util.AnnotationFormatter;
 import org.checkerframework.framework.util.MultiGraphQualifierHierarchy.MultiGraphFactory;
+import org.checkerframework.javacutil.AnnotationBuilder;
 import org.checkerframework.javacutil.AnnotationUtils;
 import org.checkerframework.javacutil.ElementUtils;
 import org.checkerframework.javacutil.Pair;
@@ -109,6 +115,11 @@ protected Set<Class<? extends Annotation>> createSupportedTypeQualifiers() {
         return qualSet;
     }
 
+    @Override
+    protected InferenceViewpointAdapter createViewpointAdapter() {
+        return new UnitsInferenceViewpointAdapter(this);
+    }
+
     // In Inference ATF, this returns the alias for a given real qualifier
     @Override
     public AnnotationMirror canonicalAnnotation(AnnotationMirror anno) {
@@ -212,6 +223,34 @@ protected void finish(
             bottoms [@checkers.inference.qual.VarAnnot]
             */
         }
+
+        @Override
+        public Set<? extends AnnotationMirror> leastUpperBounds(
+                Collection<? extends AnnotationMirror> annos1,
+                Collection<? extends AnnotationMirror> annos2) {
+            if (InferenceMain.isHackMode(annos1.size() != annos2.size())) {
+                Set<AnnotationMirror> result = AnnotationUtils.createAnnotationSet();
+                for (AnnotationMirror a1 : annos1) {
+                    for (AnnotationMirror a2 : annos2) {
+                        AnnotationMirror lub = leastUpperBound(a1, a2);
+                        if (lub != null) {
+                            result.add(lub);
+                        }
+                    }
+                }
+
+                return result;
+            }
+
+            return super.leastUpperBounds(annos1, annos2);
+        }
+    }
+
+    @Override
+    protected Set<? extends AnnotationMirror> getDefaultTypeDeclarationBounds() {
+        Set<AnnotationMirror> top = new HashSet<>();
+        top.add(unitsRepUtils.TOP);
+        return top;
     }
 
     @Override
@@ -300,21 +339,10 @@ public void handleBinaryTree(AnnotatedTypeMirror atm, BinaryTree binaryTree) {
     @Override
     public TreeAnnotator createTreeAnnotator() {
         return new ListTreeAnnotator(
-                new UnitsInferenceLiteralTreeAnnotator(),
                 new UnitsInferenceTreeAnnotator(
                         this, realChecker, realTypeFactory, variableAnnotator, slotManager));
     }
 
-    protected final class UnitsInferenceLiteralTreeAnnotator extends UnitsLiteralTreeAnnotator {
-        // Programmatically set the qualifier implicits
-        public UnitsInferenceLiteralTreeAnnotator() {
-            super(UnitsInferenceAnnotatedTypeFactory.this);
-            // in inference mode, we do not implicitly set dimensionless for the number
-            // literals as we want to treat them as polymorphic. A "cast" is inferred for
-            // each literal
-        }
-    }
-
     private final class UnitsInferenceTreeAnnotator extends InferenceTreeAnnotator {
         // TODO: per design of InferenceTreeAnnotator, this code should be moved into
         // UnitsVariableAnnotator if it performs deep traversal
@@ -388,10 +416,11 @@ private void generateVarSlotForStaticFinalConstants(
                                     && AnnotationUtils.areSame(
                                             ((ConstantSlot) slot).getValue(),
                                             unitsRepUtils.DIMENSIONLESS))) {
-                        // Generate a fresh variable for inference
+                        // Generate a fre sh variable for inference
                         AnnotationLocation loc =
                                 VariableAnnotator.treeToLocation(atypeFactory, tree);
                         VariableSlot varSlot = slotManager.createVariableSlot(loc);
+                        atm.clearAnnotations();
                         atm.replaceAnnotation(slotManager.getAnnotation(varSlot));
                     }
                 }
@@ -518,6 +547,7 @@ public Void visitNewClass(NewClassTree newClassTree, AnnotatedTypeMirror atm) {
 
                 // Replace the slot/annotation in the atm (callSiteReturnVarSlot) with the
                 // varSlotForPolyReturn for upstream analysis
+                atm.clearAnnotations();
                 atm.replaceAnnotation(slotManager.getAnnotation(varSlotForPolyReturn));
             }
 
@@ -534,10 +564,44 @@ public Void visitMethodInvocation(
                         variableAnnotator.getOrCreatePolyVar(methodInvocationTree);
                 // disable insertion of polymorphic return variable slot
                 varSlotForPolyReturn.setInsertable(false);
+                AnnotationBuilder ab =
+                        new AnnotationBuilder(realTypeFactory.getProcessingEnv(), VarAnnot.class);
+                ab.setValue("value", varSlotForPolyReturn.getId());
+                atm.clearAnnotations();
+                atm.replaceAnnotation(ab.build());
             }
 
             return null;
         }
+
+        @Override
+        public Void visitLiteral(final LiteralTree tree, AnnotatedTypeMirror type) {
+            switch (tree.getKind()) {
+                case NULL_LITERAL:
+                    replaceATM(type, unitsRepUtils.BOTTOM);
+                    return null;
+                case CHAR_LITERAL:
+                    replaceATM(type, unitsRepUtils.DIMENSIONLESS);
+                    return null;
+                case BOOLEAN_LITERAL:
+                    replaceATM(type, unitsRepUtils.DIMENSIONLESS);
+                    return null;
+                case STRING_LITERAL:
+                    replaceATM(type, unitsRepUtils.DIMENSIONLESS);
+                    return null;
+                default:
+                    return super.visitLiteral(tree, type);
+            }
+        }
+
+        private void replaceATM(AnnotatedTypeMirror atm, AnnotationMirror am) {
+            final ConstantSlot cs = slotManager.createConstantSlot(am);
+            AnnotationBuilder ab =
+                    new AnnotationBuilder(realTypeFactory.getProcessingEnv(), VarAnnot.class);
+            ab.setValue("value", cs.getId());
+            atm.clearAnnotations();
+            atm.replaceAnnotation(ab.build());
+        }
     }
 
     // for use in AnnotatedTypeMirror.toString()
diff --git a/src/units/UnitsInferenceViewpointAdapter.java b/src/units/UnitsInferenceViewpointAdapter.java
new file mode 100644
index 0000000..fb1934f
--- /dev/null
+++ b/src/units/UnitsInferenceViewpointAdapter.java
@@ -0,0 +1,45 @@
+package units;
+
+import checkers.inference.InferenceMain;
+import checkers.inference.model.ConstantSlot;
+import checkers.inference.model.Slot;
+import checkers.inference.util.InferenceViewpointAdapter;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import org.checkerframework.framework.type.AnnotatedTypeFactory;
+import org.checkerframework.framework.type.AnnotatedTypeMirror;
+import org.checkerframework.javacutil.AnnotationUtils;
+import units.representation.UnitsRepresentationUtils;
+
+public class UnitsInferenceViewpointAdapter extends InferenceViewpointAdapter {
+
+    // static reference to the singleton instance
+    protected static UnitsRepresentationUtils unitsRepUtils;
+
+    public UnitsInferenceViewpointAdapter(AnnotatedTypeFactory atypeFactory) {
+        super(atypeFactory);
+        unitsRepUtils = UnitsRepresentationUtils.getInstance();
+    }
+
+    @Override
+    protected boolean shouldAdaptMember(AnnotatedTypeMirror type, Element element) {
+        return false;
+    }
+
+    @Override
+    protected AnnotationMirror combineAnnotationWithAnnotation(
+            AnnotationMirror receiverAnnotation, AnnotationMirror declaredAnnotation) {
+        if (InferenceMain.isHackMode(declaredAnnotation == null)) {
+            return unitsRepUtils.BOTTOM;
+        }
+        Slot declSlot = InferenceMain.getInstance().getSlotManager().getSlot(declaredAnnotation);
+        if (declSlot.isConstant()) {
+            ConstantSlot cs = (ConstantSlot) declSlot;
+            if (AnnotationUtils.areSame(cs.getValue(), unitsRepUtils.RECEIVER_DEPENDANT_UNIT)) {
+                return super.combineAnnotationWithAnnotation(
+                        receiverAnnotation, declaredAnnotation);
+            }
+        }
+        return declaredAnnotation;
+    }
+}
diff --git a/src/units/UnitsLiteralTreeAnnotator.java b/src/units/UnitsLiteralTreeAnnotator.java
deleted file mode 100644
index ef4cbec..0000000
--- a/src/units/UnitsLiteralTreeAnnotator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package units;
-
-import org.checkerframework.framework.qual.LiteralKind;
-import org.checkerframework.framework.type.AnnotatedTypeFactory;
-import org.checkerframework.framework.type.treeannotator.LiteralTreeAnnotator;
-import units.representation.UnitsRepresentationUtils;
-
-/** Common base class for LiteralTreeAnnotator. */
-public abstract class UnitsLiteralTreeAnnotator extends LiteralTreeAnnotator {
-
-    UnitsRepresentationUtils unitsRepUtils = UnitsRepresentationUtils.getInstance();
-
-    // Programmatically set the qualifier for literals
-    public UnitsLiteralTreeAnnotator(AnnotatedTypeFactory atf) {
-        super(atf);
-
-        // set BOTTOM as the literal qualifier for null literals
-        addLiteralKind(LiteralKind.NULL, unitsRepUtils.BOTTOM);
-        addLiteralKind(LiteralKind.STRING, unitsRepUtils.DIMENSIONLESS);
-        addLiteralKind(LiteralKind.CHAR, unitsRepUtils.DIMENSIONLESS);
-        addLiteralKind(LiteralKind.BOOLEAN, unitsRepUtils.DIMENSIONLESS);
-
-        // TODO: set BOTTOM as the literal qualifier for lower bounds? Its nice to
-        // infer a bound which is the current mode.
-    }
-}
diff --git a/src/units/UnitsTools.java b/src/units/UnitsTools.java
index d340f45..7b01534 100644
--- a/src/units/UnitsTools.java
+++ b/src/units/UnitsTools.java
@@ -1,7 +1,6 @@
 package units;
 
-import units.notusedquals.g;
-import units.notusedquals.kg;
+import units.notusedquals.*;
 import units.qual.*;
 
 @SuppressWarnings("units")
@@ -10,8 +9,11 @@ public class UnitsTools {
     public static final @g int g = 1;
     public static final @kg int kg = 1;
 
+    public static final @mm int mm = 1;
     public static final @m int m = 1;
     public static final @km int km = 1;
+    public static final @m2 int m2 = 1;
+    public static final @m3 int m3 = 1;
 
     public static final @s int s = 1;
     public static final @ms int ms = 1;
@@ -21,10 +23,79 @@ public class UnitsTools {
     public static final @rad int rad = 1;
     public static final @deg int deg = 1;
 
+    public static final @Pa int Pa = 1;
+    public static final @kPa int kPa = 1;
+    public static final @bar int bar = 1;
+
+    public static final @K int K = 1;
+    public static final @C int C = 1;
+    public static final @mol int mol = 1;
+    public static final @kmol int kmol = 1;
+
+    public static final @mPERs int mPERs = 1;
+    public static final @m3PERhr int m3PERhr = 1;
+    public static final @gPERmol int gPERmol = 1;
+
+    public static final @W int W = 1;
+    public static final @N int N = 1;
+    public static final @J int J = 1;
+    public static final @MJ int MJ = 1;
+
+    public static final @hr int hr = 1;
+    public static final @Dimensionless int day = 1;
+    public static final @Dimensionless int year = 1;
+
+    // Conversion
+    public static @kg double g_to_kg(@g double g) {
+        return g / 1000;
+    }
+
+    // Conversion
+    public static @kg double g8_to_kg(@g8 double g8) {
+        return g8 / 100000;
+    }
+
+    public static @kgPERmol double gPERmol_to_kgPERmol(@gPERmol double gPERmol) {
+        return gPERmol / 1000;
+    }
+
+    public static @bar double pa_to_bar(@Pa double pa) {
+        return pa / 100;
+    }
+
+    public static @Pa double bar_to_pa(@bar double bar) {
+        return bar * 100;
+    }
+
+    public static @m double km_to_m(@km double km) {
+        return km * 1000;
+    }
+
+    public static @m double mm_to_m(@mm double mm) {
+        return mm / 1000;
+    }
+
+    public static @mm double m_to_mm(@m double m) {
+        return m * 1000;
+    }
+
+    public static @K double C_to_K(@C double C) {
+        return C + 273.15;
+    }
+
+    public static @ms double s_to_ms(@s double s) {
+        return s * 1000;
+    }
+
+    // Constants
+    public static final @mPERs2 double gravity = 9.80665;
+    public static final @JPERKmol double R = 8.31446261815324 * (J / K) / mol;
+
     // Testing use only
     public static final @UnknownUnits int top = 1;
     public static final @UnitsBottom int bottom = 1;
-    public static final @Dimensionless int dimensionless = 1;
+    public static final @Dimensionless int one = 1;
+    public static final @Dimensionless int Dimensionless = 1;
 
     // Conversion Functions
     public static final @ms int secondsToMilliSeconds(@s int seconds) {
diff --git a/src/units/UnitsViewpointAdapter.java b/src/units/UnitsViewpointAdapter.java
new file mode 100644
index 0000000..dc9076b
--- /dev/null
+++ b/src/units/UnitsViewpointAdapter.java
@@ -0,0 +1,39 @@
+package units;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import org.checkerframework.framework.type.AbstractViewpointAdapter;
+import org.checkerframework.framework.type.AnnotatedTypeFactory;
+import org.checkerframework.framework.type.AnnotatedTypeMirror;
+import org.checkerframework.javacutil.AnnotationUtils;
+import units.representation.UnitsRepresentationUtils;
+
+public class UnitsViewpointAdapter extends AbstractViewpointAdapter {
+
+    // static reference to the singleton instance
+    protected static UnitsRepresentationUtils unitsRepUtils;
+
+    public UnitsViewpointAdapter(AnnotatedTypeFactory atypeFactory) {
+        super(atypeFactory);
+        unitsRepUtils = UnitsRepresentationUtils.getInstance();
+    }
+
+    @Override
+    protected boolean shouldAdaptMember(AnnotatedTypeMirror type, Element element) {
+        return false;
+    }
+
+    @Override
+    protected AnnotationMirror extractAnnotationMirror(AnnotatedTypeMirror atm) {
+        return atm.getAnnotationInHierarchy(unitsRepUtils.TOP);
+    }
+
+    @Override
+    protected AnnotationMirror combineAnnotationWithAnnotation(
+            AnnotationMirror receiverAnnotation, AnnotationMirror declaredAnnotation) {
+        if (AnnotationUtils.areSame(declaredAnnotation, unitsRepUtils.RECEIVER_DEPENDANT_UNIT)) {
+            return receiverAnnotation;
+        }
+        return declaredAnnotation;
+    }
+}
diff --git a/src/units/UnitsVisitor.java b/src/units/UnitsVisitor.java
index 171fa31..7519935 100644
--- a/src/units/UnitsVisitor.java
+++ b/src/units/UnitsVisitor.java
@@ -19,7 +19,6 @@
 import java.util.Set;
 import javax.lang.model.element.AnnotationMirror;
 import org.checkerframework.common.basetype.BaseAnnotatedTypeFactory;
-import org.checkerframework.framework.source.Result;
 import org.checkerframework.framework.type.AnnotatedTypeMirror;
 import org.checkerframework.javacutil.AnnotationUtils;
 import org.checkerframework.javacutil.TreeUtils;
@@ -226,16 +225,11 @@ public Void visitBinary(BinaryTree binaryTree, Void p) {
                 // comparable constraint: lhs <: rhs, or rhs <: lhs
                 if (!(atypeFactory.getQualifierHierarchy().isSubtype(lhsAM, rhsAM)
                         || atypeFactory.getQualifierHierarchy().isSubtype(rhsAM, lhsAM))) {
-                    checker.report(
-                            Result.failure(
-                                    "comparison.unit.mismatch",
-                                    atypeFactory
-                                            .getAnnotationFormatter()
-                                            .formatAnnotationMirror(lhsAM),
-                                    atypeFactory
-                                            .getAnnotationFormatter()
-                                            .formatAnnotationMirror(rhsAM)),
-                            binaryTree);
+                    checker.reportError(
+                            binaryTree,
+                            "comparison.unit.mismatch",
+                            atypeFactory.getAnnotationFormatter().formatAnnotationMirror(lhsAM),
+                            atypeFactory.getAnnotationFormatter().formatAnnotationMirror(rhsAM));
                 }
                 // if (!AnnotationUtils.areSame(lhsAM, rhsAM)) {
                 // }
@@ -269,7 +263,8 @@ public Void visitTypeCast(TypeCastTree node, Void p) {
                             .getEffectiveAnnotationInHierarchy(
                                     UnitsRepresentationUtils.getInstance().TOP);
 
-            // If expression type is dimensionless, permit it to be casted to anything
+            // If expression type is dimensionless, permit it to be casted to
+            // anything
             if (UnitsTypecheckUtils.unitsEqual(
                     exprType, UnitsRepresentationUtils.getInstance().DIMENSIONLESS)) {
                 if (atypeFactory.getDependentTypesHelper() != null) {
diff --git a/src/units/notusedquals/N.java b/src/units/notusedquals/N.java
new file mode 100644
index 0000000..dcebaec
--- /dev/null
+++ b/src/units/notusedquals/N.java
@@ -0,0 +1,26 @@
+package units.notusedquals;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import units.qual.BUC;
+import units.qual.UnitsAlias;
+
+/**
+ * Newton.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = 1),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface N {}
diff --git a/src/units/notusedquals/kPa.java b/src/units/notusedquals/kPa.java
new file mode 100644
index 0000000..45c8ddc
--- /dev/null
+++ b/src/units/notusedquals/kPa.java
@@ -0,0 +1,26 @@
+package units.notusedquals;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import units.qual.BUC;
+import units.qual.UnitsAlias;
+
+/**
+ * A kilopascal.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 6,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = -1),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface kPa {}
diff --git a/src/units/notusedquals/kmol.java b/src/units/notusedquals/kmol.java
new file mode 100644
index 0000000..c2b58db
--- /dev/null
+++ b/src/units/notusedquals/kmol.java
@@ -0,0 +1,22 @@
+package units.notusedquals;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import units.qual.BUC;
+import units.qual.UnitsAlias;
+
+/**
+ * kili mol.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {@BUC(unit = "mol", exponent = 1)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface kmol {}
diff --git a/src/units/qual/C.java b/src/units/qual/C.java
new file mode 100644
index 0000000..7644e70
--- /dev/null
+++ b/src/units/qual/C.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Celsius.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@BaseUnit
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface C {}
diff --git a/src/units/qual/J.java b/src/units/qual/J.java
new file mode 100644
index 0000000..b72e3e5
--- /dev/null
+++ b/src/units/qual/J.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Joule.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = 2),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface J {}
diff --git a/src/units/qual/JPERKmol.java b/src/units/qual/JPERKmol.java
new file mode 100644
index 0000000..67792bd
--- /dev/null
+++ b/src/units/qual/JPERKmol.java
@@ -0,0 +1,26 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Gas constant unit
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = 2),
+            @BUC(unit = "mol", exponent = -1),
+            @BUC(unit = "K", exponent = -1),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface JPERKmol {}
diff --git a/src/units/notusedquals/K.java b/src/units/qual/K.java
similarity index 88%
rename from src/units/notusedquals/K.java
rename to src/units/qual/K.java
index ea2ce23..3dea2c9 100644
--- a/src/units/notusedquals/K.java
+++ b/src/units/qual/K.java
@@ -1,11 +1,10 @@
-package units.notusedquals;
+package units.qual;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import units.qual.BaseUnit;
 
 /**
  * Kelvin.
diff --git a/src/units/qual/MJ.java b/src/units/qual/MJ.java
new file mode 100644
index 0000000..1c76113
--- /dev/null
+++ b/src/units/qual/MJ.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mega Joule.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 9,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = 2),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface MJ {}
diff --git a/src/units/qual/MJPERm3.java b/src/units/qual/MJPERm3.java
new file mode 100644
index 0000000..629e93e
--- /dev/null
+++ b/src/units/qual/MJPERm3.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mega Joule.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 9,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = -1),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface MJPERm3 {}
diff --git a/src/units/qual/PERm2s2.java b/src/units/qual/PERm2s2.java
new file mode 100644
index 0000000..366ae95
--- /dev/null
+++ b/src/units/qual/PERm2s2.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Beta Edge Constant
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(baseUnitComponents = {@BUC(unit = "m", exponent = -2), @BUC(unit = "s", exponent = -2)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface PERm2s2 {}
diff --git a/src/units/qual/Pa.java b/src/units/qual/Pa.java
new file mode 100644
index 0000000..dfc708a
--- /dev/null
+++ b/src/units/qual/Pa.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Pascal.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = -1),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface Pa {}
diff --git a/src/units/qual/Pas.java b/src/units/qual/Pas.java
new file mode 100644
index 0000000..686a1c6
--- /dev/null
+++ b/src/units/qual/Pas.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Dynamic Viscosity
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = -1),
+            @BUC(unit = "s", exponent = -1)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface Pas {}
diff --git a/src/units/qual/RDU.java b/src/units/qual/RDU.java
new file mode 100644
index 0000000..6be2671
--- /dev/null
+++ b/src/units/qual/RDU.java
@@ -0,0 +1,19 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
+
+/**
+ * UnitReceiverDependant is the top type of the type hierarchy.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@Documented
+@SubtypeOf(UnitsRep.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) // ElementType.TYPE,
+public @interface RDU {}
diff --git a/src/units/qual/W.java b/src/units/qual/W.java
new file mode 100644
index 0000000..4698b47
--- /dev/null
+++ b/src/units/qual/W.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Watt.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = 2),
+            @BUC(unit = "s", exponent = -3)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface W {}
diff --git a/src/units/qual/WPERm2K.java b/src/units/qual/WPERm2K.java
new file mode 100644
index 0000000..37a5c6a
--- /dev/null
+++ b/src/units/qual/WPERm2K.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Heat Transfer Coefficient.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "s", exponent = -3),
+            @BUC(unit = "K", exponent = -1)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface WPERm2K {}
diff --git a/src/units/qual/bar.java b/src/units/qual/bar.java
new file mode 100644
index 0000000..1617d10
--- /dev/null
+++ b/src/units/qual/bar.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Bar.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 8,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = -1),
+            @BUC(unit = "s", exponent = -2)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface bar {}
diff --git a/src/units/qual/bars3PERm.java b/src/units/qual/bars3PERm.java
new file mode 100644
index 0000000..91bec1e
--- /dev/null
+++ b/src/units/qual/bars3PERm.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Bar divide by acceleration.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 8,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = -2),
+            @BUC(unit = "s", exponent = 1)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface bars3PERm {}
diff --git a/src/units/notusedquals/g.java b/src/units/qual/g.java
similarity index 88%
rename from src/units/notusedquals/g.java
rename to src/units/qual/g.java
index 5dce284..56e3307 100644
--- a/src/units/notusedquals/g.java
+++ b/src/units/qual/g.java
@@ -1,11 +1,10 @@
-package units.notusedquals;
+package units.qual;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import units.qual.BaseUnit;
 
 /**
  * Gram.
diff --git a/src/units/qual/g8.java b/src/units/qual/g8.java
new file mode 100644
index 0000000..0f9a8c8
--- /dev/null
+++ b/src/units/qual/g8.java
@@ -0,0 +1,20 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A kilogram.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 8,
+        baseUnitComponents = {@BUC(unit = "g", exponent = 1)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface g8 {}
diff --git a/src/units/qual/gPERmol.java b/src/units/qual/gPERmol.java
new file mode 100644
index 0000000..89e00d2
--- /dev/null
+++ b/src/units/qual/gPERmol.java
@@ -0,0 +1,19 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Molar mass gram per mol.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        baseUnitComponents = {@BUC(unit = "g", exponent = 1), @BUC(unit = "mol", exponent = -1)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface gPERmol {}
diff --git a/src/units/qual/hr.java b/src/units/qual/hr.java
new file mode 100644
index 0000000..f3f6c12
--- /dev/null
+++ b/src/units/qual/hr.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Hour.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@BaseUnit
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface hr {}
diff --git a/src/units/notusedquals/kg.java b/src/units/qual/kg.java
similarity index 86%
rename from src/units/notusedquals/kg.java
rename to src/units/qual/kg.java
index eef0c6d..2bb5c63 100644
--- a/src/units/notusedquals/kg.java
+++ b/src/units/qual/kg.java
@@ -1,12 +1,10 @@
-package units.notusedquals;
+package units.qual;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import units.qual.BUC;
-import units.qual.UnitsAlias;
 
 /**
  * A kilogram.
diff --git a/src/units/qual/kg2PERs2.java b/src/units/qual/kg2PERs2.java
new file mode 100644
index 0000000..77da0c0
--- /dev/null
+++ b/src/units/qual/kg2PERs2.java
@@ -0,0 +1,20 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mass flow rates squared
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 6,
+        baseUnitComponents = {@BUC(unit = "g", exponent = 2), @BUC(unit = "s", exponent = -2)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface kg2PERs2 {}
diff --git a/src/units/qual/kgPERm2s.java b/src/units/qual/kgPERm2s.java
new file mode 100644
index 0000000..472f979
--- /dev/null
+++ b/src/units/qual/kgPERm2s.java
@@ -0,0 +1,24 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Watt.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {
+            @BUC(unit = "g", exponent = 1),
+            @BUC(unit = "m", exponent = -2),
+            @BUC(unit = "s", exponent = -1)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface kgPERm2s {}
diff --git a/src/units/qual/kgPERm3.java b/src/units/qual/kgPERm3.java
new file mode 100644
index 0000000..62988b0
--- /dev/null
+++ b/src/units/qual/kgPERm3.java
@@ -0,0 +1,20 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Density.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {@BUC(unit = "g", exponent = 1), @BUC(unit = "m", exponent = -3)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface kgPERm3 {}
diff --git a/src/units/qual/kgPERmol.java b/src/units/qual/kgPERmol.java
new file mode 100644
index 0000000..e08efc9
--- /dev/null
+++ b/src/units/qual/kgPERmol.java
@@ -0,0 +1,20 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Molar mass kilogram per mol.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {@BUC(unit = "g", exponent = 1), @BUC(unit = "mol", exponent = -1)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface kgPERmol {}
diff --git a/src/units/qual/kgPERs.java b/src/units/qual/kgPERs.java
new file mode 100644
index 0000000..75d14b6
--- /dev/null
+++ b/src/units/qual/kgPERs.java
@@ -0,0 +1,20 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mass flow rates
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = 3,
+        baseUnitComponents = {@BUC(unit = "g", exponent = 1), @BUC(unit = "s", exponent = -1)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface kgPERs {}
diff --git a/src/units/qual/m2PERs2.java b/src/units/qual/m2PERs2.java
new file mode 100644
index 0000000..ef71a8e
--- /dev/null
+++ b/src/units/qual/m2PERs2.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Velocity squared
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(baseUnitComponents = {@BUC(unit = "m", exponent = 2), @BUC(unit = "s", exponent = -2)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface m2PERs2 {}
diff --git a/src/units/qual/m2PERs2K.java b/src/units/qual/m2PERs2K.java
new file mode 100644
index 0000000..ddcb816
--- /dev/null
+++ b/src/units/qual/m2PERs2K.java
@@ -0,0 +1,23 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * CSpecific gas constant
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        baseUnitComponents = {
+            @BUC(unit = "m", exponent = 2),
+            @BUC(unit = "s", exponent = -2),
+            @BUC(unit = "K", exponent = -1)
+        })
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface m2PERs2K {}
diff --git a/src/units/qual/m2s2.java b/src/units/qual/m2s2.java
new file mode 100644
index 0000000..8200a82
--- /dev/null
+++ b/src/units/qual/m2s2.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Edge Constant
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(baseUnitComponents = {@BUC(unit = "m", exponent = 2), @BUC(unit = "s", exponent = 2)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface m2s2 {}
diff --git a/src/units/qual/m3.java b/src/units/qual/m3.java
new file mode 100644
index 0000000..0f65b00
--- /dev/null
+++ b/src/units/qual/m3.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A cubic meter.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(baseUnitComponents = {@BUC(unit = "m", exponent = 3)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface m3 {}
diff --git a/src/units/qual/m3PERhr.java b/src/units/qual/m3PERhr.java
new file mode 100644
index 0000000..9867520
--- /dev/null
+++ b/src/units/qual/m3PERhr.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Cubic meter per hour.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(baseUnitComponents = {@BUC(unit = "m", exponent = 3), @BUC(unit = "hr", exponent = -1)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface m3PERhr {}
diff --git a/src/units/qual/mPERs2.java b/src/units/qual/mPERs2.java
new file mode 100644
index 0000000..a78668a
--- /dev/null
+++ b/src/units/qual/mPERs2.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Acceleration
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(baseUnitComponents = {@BUC(unit = "m", exponent = 1), @BUC(unit = "s", exponent = -2)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface mPERs2 {}
diff --git a/src/units/qual/mm.java b/src/units/qual/mm.java
new file mode 100644
index 0000000..5a69c70
--- /dev/null
+++ b/src/units/qual/mm.java
@@ -0,0 +1,20 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A millisecond.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = -3,
+        baseUnitComponents = {@BUC(unit = "m", exponent = 1)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface mm {}
diff --git a/src/units/qual/mm2.java b/src/units/qual/mm2.java
new file mode 100644
index 0000000..ab67ad9
--- /dev/null
+++ b/src/units/qual/mm2.java
@@ -0,0 +1,20 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A millisecond.
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(
+        prefixExponent = -6,
+        baseUnitComponents = {@BUC(unit = "m", exponent = 2)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface mm2 {}
diff --git a/src/units/notusedquals/mol.java b/src/units/qual/mol.java
similarity index 88%
rename from src/units/notusedquals/mol.java
rename to src/units/qual/mol.java
index 6fa9285..8935647 100644
--- a/src/units/notusedquals/mol.java
+++ b/src/units/qual/mol.java
@@ -1,11 +1,10 @@
-package units.notusedquals;
+package units.qual;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import units.qual.BaseUnit;
 
 /**
  * mol.
diff --git a/src/units/qual/s2PERm2.java b/src/units/qual/s2PERm2.java
new file mode 100644
index 0000000..0e9bf75
--- /dev/null
+++ b/src/units/qual/s2PERm2.java
@@ -0,0 +1,18 @@
+package units.qual;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Edge Constant
+ *
+ * @checker_framework.manual #units-checker Units Checker
+ */
+@UnitsAlias(baseUnitComponents = {@BUC(unit = "m", exponent = -2), @BUC(unit = "s", exponent = 2)})
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+public @interface s2PERm2 {}
diff --git a/src/units/representation/TypecheckUnit.java b/src/units/representation/TypecheckUnit.java
index db35df7..78a9aee 100644
--- a/src/units/representation/TypecheckUnit.java
+++ b/src/units/representation/TypecheckUnit.java
@@ -11,6 +11,7 @@
 public class TypecheckUnit {
     private boolean uu;
     private boolean ub;
+    private boolean rdu;
     private int prefixExponent;
     // Tree map maintaining sorted order on base unit names
     private final Map<String, Integer> exponents;
@@ -20,6 +21,8 @@ public TypecheckUnit() {
         uu = false;
         // default UU value is false
         ub = false;
+        // default UU value is false
+        rdu = false;
         // default prefixExponent is 0
         prefixExponent = 0;
         // default exponents are 0
@@ -44,6 +47,15 @@ public boolean isUnitsBottom() {
         return ub;
     }
 
+    public void setRDUnits(boolean val) {
+        rdu = val;
+        assert !(uu && ub);
+    }
+
+    public boolean isRDUnits() {
+        return rdu;
+    }
+
     public void setPrefixExponent(int exp) {
         prefixExponent = exp;
     }
diff --git a/src/units/representation/UnitsRepresentationUtils.java b/src/units/representation/UnitsRepresentationUtils.java
index ed02991..e2a6bbe 100644
--- a/src/units/representation/UnitsRepresentationUtils.java
+++ b/src/units/representation/UnitsRepresentationUtils.java
@@ -26,6 +26,7 @@
 import units.qual.BUC;
 import units.qual.Dimensionless;
 import units.qual.PolyUnit;
+import units.qual.RDU;
 import units.qual.UnitsAlias;
 import units.qual.UnitsBottom;
 import units.qual.UnitsRep;
@@ -64,6 +65,8 @@ public class UnitsRepresentationUtils {
 
     public AnnotationMirror SURFACE_BOTTOM;
 
+    public AnnotationMirror RECEIVER_DEPENDANT_UNIT;
+
     // /** Instance of {@link VarAnnot} for use in UnitsVisitor in infer mode. */
     // public AnnotationMirror VARANNOT;
 
@@ -212,6 +215,8 @@ public void postInit() {
 
         RAWUNITSREP = AnnotationBuilder.fromClass(elements, UnitsRep.class);
 
+        RECEIVER_DEPENDANT_UNIT = AnnotationBuilder.fromClass(elements, RDU.class);
+
         Map<String, Integer> zeroBaseDimensions = createZeroFilledBaseUnitsMap();
         TOP = createInternalUnit(true, false, 0, zeroBaseDimensions);
         BOTTOM = createInternalUnit(false, true, 0, zeroBaseDimensions);
@@ -494,6 +499,8 @@ public TypecheckUnit createTypecheckUnit(AnnotationMirror anno) {
         // if it is a polyunit annotation, generate top
         if (AnnotationUtils.areSameByClass(anno, PolyUnit.class)) {
             unit.setUnknownUnits(true);
+        } else if (AnnotationUtils.areSameByClass(anno, RDU.class)) {
+            unit.setRDUnits(true);
         }
         // if it is a units internal annotation, generate the internal unit
         else if (AnnotationUtils.areSameByClass(anno, UnitsRep.class)) {
diff --git a/src/units/solvers/backend/z3smt/UnitsZ3SmtFormatTranslator.java b/src/units/solvers/backend/z3smt/UnitsZ3SmtFormatTranslator.java
index 1208ad7..1b7219e 100644
--- a/src/units/solvers/backend/z3smt/UnitsZ3SmtFormatTranslator.java
+++ b/src/units/solvers/backend/z3smt/UnitsZ3SmtFormatTranslator.java
@@ -60,6 +60,7 @@ public String generateZ3SlotDeclaration(VariableSlot slot) {
 
         slotDeclaration.add(addZ3BoolDefinition(encodedSlot.getUnknownUnits()));
         slotDeclaration.add(addZ3BoolDefinition(encodedSlot.getUnitsBottom()));
+        slotDeclaration.add(addZ3BoolDefinition(encodedSlot.getRDUnits()));
 
         if (unitsRepUtils.serializePrefix()) {
             slotDeclaration.add(addZ3IntDefinition(encodedSlot.getPrefixExponent()));
@@ -138,6 +139,8 @@ protected Z3InferenceUnit serializeConstantSlot(ConstantSlot slot) {
             encodedSlot.setUnknownUnits(true);
         } else if (unit.isUnitsBottom()) {
             encodedSlot.setUnitsBottom(true);
+        } else if (unit.isRDUnits()) {
+            encodedSlot.setRDUnits(true);
         } else {
             encodedSlot.setPrefixExponent(unit.getPrefixExponent());
             for (String bu : unitsRepUtils.serializableBaseUnits()) {
@@ -166,31 +169,35 @@ public void preAnalyzeSlots(Collection<Slot> slots) {
 
     @Override
     public BoolExpr encodeSlotWellformnessConstraint(VariableSlot slot) {
+        Z3InferenceUnit serializedSlot = slot.serialize(this);
         if (slot instanceof ConstantSlot) {
             ConstantSlot cs = (ConstantSlot) slot;
             AnnotationMirror anno = cs.getValue();
-            // encode PolyAll and PolyUnit as constant trues
+            // encode PolyUnit as constant trues
             if (AnnotationUtils.areSame(anno, unitsRepUtils.POLYUNIT)) {
                 return ctx.mkTrue();
             }
+            if (AnnotationUtils.areSame(anno, unitsRepUtils.RECEIVER_DEPENDANT_UNIT)) {
+                return serializedSlot.getRDUnits();
+            }
         }
-
-        Z3InferenceUnit serializedSlot = slot.serialize(this);
         return UnitsZ3SmtEncoderUtils.slotWellformedness(ctx, serializedSlot);
     }
 
     @Override
     public BoolExpr encodeSlotPreferenceConstraint(VariableSlot slot) {
+        Z3InferenceUnit serializedSlot = slot.serialize(this);
         if (slot instanceof ConstantSlot) {
             ConstantSlot cs = (ConstantSlot) slot;
             AnnotationMirror anno = cs.getValue();
-            // encode PolyAll and PolyUnit as constant trues
+            // encode PolyUnit as constant trues
             if (AnnotationUtils.areSame(anno, unitsRepUtils.POLYUNIT)) {
                 return ctx.mkTrue();
             }
+            if (AnnotationUtils.areSame(anno, unitsRepUtils.RECEIVER_DEPENDANT_UNIT)) {
+                return serializedSlot.getRDUnits();
+            }
         }
-
-        Z3InferenceUnit serializedSlot = slot.serialize(this);
         return UnitsZ3SmtEncoderUtils.slotPreference(ctx, serializedSlot);
     }
 
diff --git a/src/units/solvers/backend/z3smt/encoder/UnitsZ3SmtCombineConstraintEncoder.java b/src/units/solvers/backend/z3smt/encoder/UnitsZ3SmtCombineConstraintEncoder.java
new file mode 100644
index 0000000..f89e204
--- /dev/null
+++ b/src/units/solvers/backend/z3smt/encoder/UnitsZ3SmtCombineConstraintEncoder.java
@@ -0,0 +1,61 @@
+package units.solvers.backend.z3smt.encoder;
+
+import backend.z3smt.Z3SmtFormatTranslator;
+import backend.z3smt.encoder.Z3SmtAbstractConstraintEncoder;
+import checkers.inference.model.ConstantSlot;
+import checkers.inference.model.VariableSlot;
+import checkers.inference.solver.backend.encoder.combine.CombineConstraintEncoder;
+import checkers.inference.solver.frontend.Lattice;
+import com.microsoft.z3.BoolExpr;
+import com.microsoft.z3.Context;
+import units.representation.TypecheckUnit;
+import units.solvers.backend.z3smt.representation.Z3InferenceUnit;
+
+public class UnitsZ3SmtCombineConstraintEncoder
+        extends Z3SmtAbstractConstraintEncoder<Z3InferenceUnit, TypecheckUnit>
+        implements CombineConstraintEncoder<BoolExpr> {
+
+    public UnitsZ3SmtCombineConstraintEncoder(
+            Lattice lattice,
+            Context ctx,
+            Z3SmtFormatTranslator<Z3InferenceUnit, TypecheckUnit> z3SmtFormatTranslator) {
+        super(lattice, ctx, z3SmtFormatTranslator);
+    }
+
+    private BoolExpr receiver_dependent(
+            VariableSlot target, VariableSlot declared, VariableSlot result) {
+        Z3InferenceUnit tar = target.serialize(z3SmtFormatTranslator);
+        Z3InferenceUnit decl = declared.serialize(z3SmtFormatTranslator);
+        Z3InferenceUnit res = result.serialize(z3SmtFormatTranslator);
+
+        return ctx.mkAnd(
+                ctx.mkImplies(decl.getRDUnits(), UnitsZ3SmtEncoderUtils.equality(ctx, tar, res)),
+                ctx.mkImplies(
+                        ctx.mkNot(decl.getRDUnits()),
+                        UnitsZ3SmtEncoderUtils.equality(ctx, decl, res)));
+    }
+
+    @Override
+    public BoolExpr encodeVariable_Variable(
+            VariableSlot target, VariableSlot declared, VariableSlot result) {
+        return receiver_dependent(target, declared, result);
+    }
+
+    @Override
+    public BoolExpr encodeVariable_Constant(
+            VariableSlot target, ConstantSlot declared, VariableSlot result) {
+        return receiver_dependent(target, declared, result);
+    }
+
+    @Override
+    public BoolExpr encodeConstant_Variable(
+            ConstantSlot target, VariableSlot declared, VariableSlot result) {
+        return receiver_dependent(target, declared, result);
+    }
+
+    @Override
+    public BoolExpr encodeConstant_Constant(
+            ConstantSlot target, ConstantSlot declared, VariableSlot result) {
+        return receiver_dependent(target, declared, result);
+    }
+}
diff --git a/src/units/solvers/backend/z3smt/encoder/UnitsZ3SmtConstraintEncoderFactory.java b/src/units/solvers/backend/z3smt/encoder/UnitsZ3SmtConstraintEncoderFactory.java
index 83b8acc..2056456 100644
--- a/src/units/solvers/backend/z3smt/encoder/UnitsZ3SmtConstraintEncoderFactory.java
+++ b/src/units/solvers/backend/z3smt/encoder/UnitsZ3SmtConstraintEncoderFactory.java
@@ -63,7 +63,7 @@ public ExistentialConstraintEncoder<BoolExpr> createExistentialConstraintEncoder
 
     @Override
     public CombineConstraintEncoder<BoolExpr> createCombineConstraintEncoder() {
-        return null;
+        return new UnitsZ3SmtCombineConstraintEncoder(lattice, ctx, formatTranslator);
     }
 
     @Override
diff --git a/src/units/solvers/backend/z3smt/representation/Z3InferenceUnit.java b/src/units/solvers/backend/z3smt/representation/Z3InferenceUnit.java
index c5890d0..c845293 100644
--- a/src/units/solvers/backend/z3smt/representation/Z3InferenceUnit.java
+++ b/src/units/solvers/backend/z3smt/representation/Z3InferenceUnit.java
@@ -19,6 +19,7 @@ public class Z3InferenceUnit {
 
     private BoolExpr uu;
     private BoolExpr ub;
+    private BoolExpr rdu;
     private IntExpr prefixExponent;
     // Tree map maintaining sorted order on base unit names
     private final Map<String, IntExpr> exponents;
@@ -40,6 +41,8 @@ public static Z3InferenceUnit makeConstantSlot(Context ctx, int slotID) {
         slot.uu = ctx.mkBool(false);
         // default UU value is false
         slot.ub = ctx.mkBool(false);
+        // default UU value is false
+        slot.rdu = ctx.mkBool(false);
         // default prefixExponent is 0
         slot.prefixExponent = slot.intZero;
 
@@ -67,6 +70,8 @@ public static Z3InferenceUnit makeVariableSlot(Context ctx, int slotID) {
                         UnitsZ3SmtEncoderUtils.z3VarName(
                                 slotID, UnitsZ3SmtEncoderUtils.prefixSlotName));
 
+        slot.rdu = ctx.mkBool(false);
+
         for (String baseUnit : UnitsRepresentationUtils.getInstance().serializableBaseUnits()) {
             slot.exponents.put(
                     baseUnit, ctx.mkIntConst(UnitsZ3SmtEncoderUtils.z3VarName(slotID, baseUnit)));
@@ -91,6 +96,14 @@ public BoolExpr getUnitsBottom() {
         return ub;
     }
 
+    public void setRDUnits(boolean val) {
+        rdu = ctx.mkBool(val);
+    }
+
+    public BoolExpr getRDUnits() {
+        return rdu;
+    }
+
     public void setPrefixExponent(int exp) {
         prefixExponent = ctx.mkInt(exp);
     }
diff --git a/statistics.txt b/statistics.txt
deleted file mode 100644
index cdd750c..0000000
--- a/statistics.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-====================== Statistics =======================
-serialize_prefix: 1
-serialize_baseunits: 1
-smt_serialization_time(millisec): 149
-smt_solving_time(millisec): 351
-total_slots: 54
-total_variable_slots: 44
-constantslot: 10
-variableslot: 30
-existentialvariableslot: 1
-combvariableslot: 10
-refinementvariableslot: 2
-lubvariableslot: 1
-total_constraints: 40
-combineconstraint: 10
-subtypeconstraint: 28
-equalityconstraint: 2
-=========================================================
diff --git a/testing/inference/AbstractEdge.java b/testing/inference/AbstractEdge.java
new file mode 100644
index 0000000..aaa634e
--- /dev/null
+++ b/testing/inference/AbstractEdge.java
@@ -0,0 +1,3 @@
+public class AbstractEdge<N extends Object> {
+    public AbstractEdge(N start, N end) {}
+}
diff --git a/testing/inference/GenericMethods.java b/testing/inference/GenericMethods.java
index 43bdaf0..caed357 100644
--- a/testing/inference/GenericMethods.java
+++ b/testing/inference/GenericMethods.java
@@ -12,7 +12,6 @@ public <T> T idOne(T param) {
     }
 
     public <T> String mStringCatOne(T param) {
-        // :: fixable-error: (method.invocation.invalid)
         return param.toString() + param;
     }
 
diff --git a/testing/inference/JavaUtilConcurrentTimeUnit.java b/testing/inference/JavaUtilConcurrentTimeUnit.java
index c22aa5c..0bfbc06 100644
--- a/testing/inference/JavaUtilConcurrentTimeUnit.java
+++ b/testing/inference/JavaUtilConcurrentTimeUnit.java
@@ -28,4 +28,32 @@ void test2() {
 
         @ns long nanosec = ns.convert(10L, TimeUnit.DAYS);
     }
+
+    void testParams() {
+        TimeUnit s_unit = TimeUnit.SECONDS;
+        TimeUnit ns_unit = NANOSECONDS;
+
+        long ns = 1000;
+        long s = 1000;
+
+        // :: fixable-error: (argument.type.incompatible)
+        TimeUnit.SECONDS.toMillis(s);
+        // :: fixable-error: (argument.type.incompatible)
+        TimeUnit.NANOSECONDS.toMillis(ns);
+
+        // :: fixable-error: (argument.type.incompatible)
+        ns_unit.toMillis(ns);
+        // :: fixable-error: (argument.type.incompatible)
+        s_unit.toMillis(s);
+    }
+
+    void testReturn(long s1, long s2) {
+        TimeUnit s = TimeUnit.SECONDS;
+        TimeUnit ms = TimeUnit.MILLISECONDS;
+
+        // :: fixable-error: (assignment.type.incompatible)
+        s1 = s.convert(10L, NANOSECONDS);
+        // :: fixable-error: (assignment.type.incompatible)
+        s2 = TimeUnit.SECONDS.convert(10L, NANOSECONDS);
+    }
 }
diff --git a/testing/typecheck/Arithmetic.java b/testing/typecheck/Arithmetic.java
new file mode 100644
index 0000000..4ff2d85
--- /dev/null
+++ b/testing/typecheck/Arithmetic.java
@@ -0,0 +1,9 @@
+import units.UnitsTools;
+import units.qual.*;
+
+class Arithmetic {
+    void test() {
+        @m2 int area1 = UnitsTools.m * UnitsTools.m;
+        @m double area2 = Math.pow(UnitsTools.m, 2);
+    }
+}
diff --git a/testing/typecheck/JavaUtilConcurrentTimeUnit.java b/testing/typecheck/JavaUtilConcurrentTimeUnit.java
index d548579..ff62699 100644
--- a/testing/typecheck/JavaUtilConcurrentTimeUnit.java
+++ b/testing/typecheck/JavaUtilConcurrentTimeUnit.java
@@ -36,10 +36,14 @@ void test2() {
         // :: error: (assignment.type.incompatible)
         ms = ns;
 
-        // ensure the poly convert works
+        // ensure RDU convert works
         @s long seconds = s.convert(10L, NANOSECONDS);
+        // :: error: (assignment.type.incompatible)
+        @s long not_seconds = ms.convert(10L, NANOSECONDS);
 
         @s long secondsTwo = TimeUnit.SECONDS.convert(10L, NANOSECONDS);
+        // :: error: (assignment.type.incompatible)
+        @s long not_secondsTwo = TimeUnit.MILLISECONDS.convert(10L, NANOSECONDS);
 
         // convert 10 minutes to milliseconds
         @ms long milliseconds = TimeUnit.MILLISECONDS.convert(10L, TimeUnit.MINUTES);
@@ -59,4 +63,23 @@ void bad() {
         // :: error: (assignment.type.incompatible)
         @s TimeUnit s4 = NANOSECONDS;
     }
+
+    void testParams(@ns long ns, @s long s) {
+        @s TimeUnit s_unit = TimeUnit.SECONDS;
+        @ns TimeUnit ns_unit = NANOSECONDS;
+
+        TimeUnit.SECONDS.toMillis(s);
+        TimeUnit.NANOSECONDS.toMillis(ns);
+        // :: error: (argument.type.incompatible)
+        TimeUnit.NANOSECONDS.toMillis(s);
+        // :: error: (argument.type.incompatible)
+        TimeUnit.SECONDS.toMillis(ns);
+
+        ns_unit.toMillis(ns);
+        s_unit.toMillis(s);
+        // :: error: (argument.type.incompatible)
+        s_unit.toMillis(ns);
+        // :: error: (argument.type.incompatible)
+        ns_unit.toMillis(s);
+    }
 }
diff --git a/testing/typecheck/RDUMethodReceiver.java b/testing/typecheck/RDUMethodReceiver.java
new file mode 100644
index 0000000..ac51527
--- /dev/null
+++ b/testing/typecheck/RDUMethodReceiver.java
@@ -0,0 +1,48 @@
+import units.qual.*;
+
+public class RDUMethodReceiver {
+
+    // :: error: (super.invocation.invalid)
+    @m public class MeterClass {
+        @RDU
+        Object get(@m MeterClass this) {
+            return null;
+        }
+
+        Object set(@m MeterClass this, @RDU Object x) {
+            return null;
+        }
+    }
+
+    // :: error: (super.invocation.invalid)
+    @s public class SecondClass {
+        @RDU
+        Object get(@s SecondClass this) {
+            return null;
+        }
+
+        Object set(@s SecondClass this, @RDU Object x) {
+            return null;
+        }
+    }
+
+    void invoke() {
+        MeterClass mc = new MeterClass();
+        @m Object x = mc.get();
+        mc.set(x);
+
+        SecondClass sc = new SecondClass();
+        @s Object y = sc.get();
+        sc.set(y);
+
+        // :: error: (assignment.type.incompatible)
+        @m Object z = sc.get();
+        // :: error: (argument.type.incompatible)
+        sc.set(z);
+
+        // :: error: (assignment.type.incompatible)
+        @s Object w = mc.get();
+        // :: error: (argument.type.incompatible)
+        mc.set(w);
+    }
+}
diff --git a/testing/typecheck/UnitsToolsConstants.java b/testing/typecheck/UnitsToolsConstants.java
index 75322b6..15b12ad 100644
--- a/testing/typecheck/UnitsToolsConstants.java
+++ b/testing/typecheck/UnitsToolsConstants.java
@@ -34,6 +34,6 @@ void test() {
     void test2() {
         uu = UnitsTools.top;
         bot = UnitsTools.bottom;
-        dim = UnitsTools.dimensionless;
+        dim = UnitsTools.one;
     }
 }