cql_qdm_patientapi 1.2.0 → 1.3.0

data/app/assets/javascripts/datatypes/procedure.js.coffee

@@ -12,25 +12,14 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_anatomicalApproachSite = @entry.anatomical_approach
-    @_anatomicalLocationSite = @entry.anatomical_location
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_ordinality = @entry.ordinality
-    @_reason = @entry.reason
-    delete @entry.end_time
-
-  ###
-  @returns {Code}
-  ###
-  anatomicalApproachSite: ->
-    if @_anatomicalApproachSite?
-      new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
-    else
-      null
+  constructor: (entry) ->
+    super entry
+    @_anatomicalLocationSite = entry.anatomical_location
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_negationRationale = entry.negationReason
+    @_ordinality = entry.ordinality
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Code}
@@ -47,15 +36,6 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
-  ###
-  @returns {Code}
-  ###
-  method: ->
-    if @_method?
-      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
-    else
-      null
-
   ###
   @returns {Code}
   ###
@@ -93,35 +73,25 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_anatomicalApproachSite = @entry.anatomical_approach
-    @_anatomicalLocationSite = @entry.anatomical_location
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_incisionDatetime = CQL_QDM.Helpers.convertDateTime(@entry.incisionTime)
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_ordinality = @entry.ordinality
-    @_reason = @entry.reason
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_anatomicalLocationSite = entry.anatomical_location
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_incisionDatetime = CQL_QDM.Helpers.convertDateTime(entry.incisionTime)
+    @_method = entry.method
+    @_negationRationale = entry.negationReason
+    @_ordinality = entry.ordinality
+    @_reason = entry.reason
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    if @entry.values? && @entry.values.length > 0
-      @_result = @entry.values?[0]
-    @_status = @entry.qdm_status
-    @_components = @entry.components
-
-  ###
-  @returns {Code}
-  ###
-  anatomicalApproachSite: ->
-    if @_anatomicalApproachSite?
-      new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
-    else
-      null
+    if entry.values? && entry.values.length > 0
+      @_result = entry.values?[0]
+    @_status = entry.qdm_status
+    @_components = entry.components
 
   ###
   @returns {Code}
@@ -226,25 +196,14 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_anatomicalApproachSite = @entry.anatomical_approach
-    @_anatomicalLocationSite = @entry.anatomical_location
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_ordinality = @entry.ordinality
-    @_reason = @entry.reason
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    delete @entry.end_time
-
-  ###
-  @returns {Code}
-  ###
-  anatomicalApproachSite: ->
-    if @_anatomicalApproachSite?
-      new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
-    else
-      null
+  constructor: (entry) ->
+    super entry
+    @_anatomicalLocationSite = entry.anatomical_location
+    @_negationRationale = entry.negationReason
+    @_ordinality = entry.ordinality
+    @_reason = entry.reason
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    delete entry.end_time
 
   ###
   @returns {Code}
@@ -261,15 +220,6 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
-  ###
-  @returns {Code}
-  ###
-  method: ->
-    if @_method?
-      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
-    else
-      null
-
   ###
   @returns {Code}
   ###

data/app/assets/javascripts/datatypes/substance.js.coffee

@@ -14,20 +14,19 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_negationRationale = @entry.negationReason
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_negationRationale = entry.negationReason
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    @_route = @entry.route
-    @_supply = @entry.supply
+    @_route = entry.route
 
   ###
   Author date time is only present when this data type has been negated.
@@ -86,14 +85,6 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
     else
       null
 
-  ###
-  @returns {Quantity}
-  ###
-  supply: ->
-    if @_supply?
-      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
-    else
-      null
 
 
 ###
@@ -104,18 +95,17 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_refills = @entry.refills
-    @_route = @entry.route
-    @_supply = @entry.supply
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_refills = entry.refills
+    @_route = entry.route
+    @_supply = entry.supply
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -144,15 +134,6 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
     else
       null
 
-  ###
-  @returns {Code}
-  ###
-  method: ->
-    if @_method?
-      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
-    else
-      null
-
   ###
   @returns {Code}
   ###
@@ -208,18 +189,16 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_refills = @entry.refills
-    @_route = @entry.route
-    @_supply = @entry.supply
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_refills = entry.refills
+    @_route = entry.route
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -248,15 +227,6 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
     else
       null
 
-  ###
-  @returns {Code}
-  ###
-  method: ->
-    if @_method?
-      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
-    else
-      null
-
   ###
   @returns {Code}
   ###
@@ -292,12 +262,3 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
       new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null
-
-  ###
-  @returns {Quantity}
-  ###
-  supply: ->
-    if @_supply?
-      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
-    else
-      null

data/app/assets/javascripts/datatypes/symptom.js.coffee

@@ -18,15 +18,15 @@ class CQL_QDM.Symptom extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_prevalencePeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_prevalencePeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_prevalencePeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_prevalencePeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_prevalencePeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    @_severity = @entry.severity
+    @_severity = entry.severity
 
   ###
   @returns {Interval<Date>}

data/app/assets/javascripts/utils/helpers.js.coffee

@@ -19,9 +19,9 @@ class CQL_QDM.Helpers
   @convertDateTime: (input) ->
     if input?
       if moment.utc(input, 'MM/DD/YYYY hh:mm A', true).isValid() || moment.utc(input, 'MM/DD/YYYY h:mm A', true).isValid()
-        cql.DateTime.fromDate(moment.utc(input, 'MM/DD/YYYY hh:mm A').toDate(), 0)
+        cql.DateTime.fromJSDate(moment.utc(input, 'MM/DD/YYYY hh:mm A').toDate(), 0)
       else
-        cql.DateTime.fromDate(moment.utc(input, 'X').toDate(), 0)
+        cql.DateTime.fromJSDate(moment.utc(input, 'X').toDate(), 0)
     else
       null
 
@@ -58,6 +58,12 @@ class CQL_QDM.Helpers
         code = input.code.code
         display = input.description
         new cql.Code(code, code_system, null, display || null)
+      else if input.numerator_scalar? and input.denominator_scalar?
+        input.numerator_units =  "1" if !input.numerator_units? or input.numerator_units == ""
+        input.denominator_units =  "1" if !input.denominator_units? or input.denominator_units == ""
+        numerator = new cql.Quantity({value: input.numerator_scalar, unit: input.numerator_units})
+        denominator = new cql.Quantity({value: input.denominator_scalar, unit: input.denominator_units})
+        new cql.Ratio({numerator: numerator, denominator: denominator})
       # Check that the scalar portion is a number and the units are a non-zero length string.
       else if (input.scalar?.match(/^[-+]?[0-9]*\.?[0-9]+$/) != null)
         if input.units.length > 0

data/lib/cql_qdm_patientapi/version.rb

@@ -1,3 +1,3 @@
 module CqlQdmPatientapi
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/vendor/assets/javascripts/cql4browsers.js

@@ -1,6 +1,6 @@
 /**
- * no_asset_compression
- **/
+* no_asset_compression
+**/
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
@@ -345,15 +345,17 @@
 
 
 
-},{"./datatypes/datatypes":6,"./fhir/models":90,"./util/util":135}],4:[function(require,module,exports){
+},{"./datatypes/datatypes":6,"./fhir/models":91,"./util/util":136}],4:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var codeservice, context, datatypes, exec, expression, library, patient, quantity, repository, results;
+  var codeservice, context, datatypes, exec, expression, library, patient, quantity, ratio, repository, results;
 
   library = require('./elm/library');
 
   quantity = require('./elm/quantity');
 
+  ratio = require('./elm/ratio');
+
   expression = require('./elm/expression');
 
   repository = require('./runtime/repository');
@@ -388,6 +390,8 @@
 
   module.exports.Quantity = quantity.Quantity;
 
+  module.exports.Ratio = ratio.Ratio;
+
   module.exports.Expression = expression.Expression;
 
   module.exports.ValueSet = datatypes.ValueSet;
@@ -406,7 +410,7 @@
 
 
 
-},{"./cql-code-service":1,"./cql-patient":3,"./datatypes/datatypes":6,"./elm/expression":20,"./elm/library":25,"./elm/quantity":32,"./runtime/context":129,"./runtime/executor":130,"./runtime/repository":131,"./runtime/results":132}],5:[function(require,module,exports){
+},{"./cql-code-service":1,"./cql-patient":3,"./datatypes/datatypes":6,"./elm/expression":20,"./elm/library":25,"./elm/quantity":32,"./elm/ratio":34,"./runtime/context":130,"./runtime/executor":131,"./runtime/repository":132,"./runtime/results":133}],5:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Code, CodeSystem, Concept, ValueSet, codesInList, codesMatch, toCodeList, typeIsArray;
@@ -462,8 +466,37 @@
       this.codes = codes != null ? codes : [];
     }
 
+    Object.defineProperties(ValueSet.prototype, {
+      isValueSet: {
+        get: function() {
+          return true;
+        }
+      }
+    });
+
     ValueSet.prototype.hasMatch = function(code) {
-      return codesInList(toCodeList(code), this.codes);
+      var codeItem, codesList, i, len, matchFound, multipleCodeSystemsExist, ref;
+      codesList = toCodeList(code);
+      if (codesList.length === 1 && typeof codesList[0] === 'string') {
+        matchFound = false;
+        multipleCodeSystemsExist = false;
+        ref = this.codes;
+        for (i = 0, len = ref.length; i < len; i++) {
+          codeItem = ref[i];
+          if (codeItem.system !== this.codes[0].system) {
+            multipleCodeSystemsExist = true;
+          }
+          if (codeItem.code === codesList[0]) {
+            matchFound = true;
+          }
+          if (multipleCodeSystemsExist && matchFound) {
+            throw new Error('In (valueset) is ambiguous -- multiple codes with multiple code systems exist in value set.');
+          }
+        }
+        return matchFound;
+      } else {
+        return codesInList(codesList, this.codes);
+      }
     };
 
     return ValueSet;
@@ -518,7 +551,7 @@
 
 
 
-},{"../util/util":135}],6:[function(require,module,exports){
+},{"../util/util":136}],6:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var clinical, datetime, element, i, interval, j, len, len1, lib, libs, logic, ref, uncertainty;
@@ -551,13 +584,15 @@
 },{"./clinical":5,"./datetime":7,"./interval":9,"./logic":10,"./uncertainty":11}],7:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Uncertainty, cqlFormatStringToMomentFormatString, getTimezoneSeparatorFromString, isValidDateTimeStringFormat, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString;
+  var Date, DateTime, Uncertainty, cqlFormatStringToMomentFormatString, daysInMonth, getTimezoneSeparatorFromString, isValidDateStringFormat, isValidDateTimeStringFormat, jsDate, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString, ref;
 
   Uncertainty = require('./uncertainty').Uncertainty;
 
+  ref = require('../util/util'), jsDate = ref.jsDate, normalizeMillisecondsField = ref.normalizeMillisecondsField, normalizeMillisecondsFieldInString = ref.normalizeMillisecondsFieldInString, getTimezoneSeparatorFromString = ref.getTimezoneSeparatorFromString;
+
   moment = require('moment');
 
-  module.exports.DateTime = DateTime = (function() {
+  DateTime = (function() {
     DateTime.Unit = {
       YEAR: 'year',
       MONTH: 'month',
@@ -578,7 +613,7 @@
       }
       matches = /(\d{4})(-(\d{2}))?(-(\d{2}))?(T((\d{2})(\:(\d{2})(\:(\d{2})(\.(\d+))?)?)?)?(Z|(([+-])(\d{2})(\:?(\d{2}))?))?)?/.exec(string);
       if (matches == null) {
-        throw new Error('Invalid DateTime String: ' + string);
+        return null;
       }
       years = matches[1];
       months = matches[3];
@@ -591,10 +626,10 @@
         milliseconds = normalizeMillisecondsField(milliseconds);
       }
       if (milliseconds != null) {
-        string = normalizeMillisecondsFieldInString(string, matches);
+        string = normalizeMillisecondsFieldInString(string, matches[14]);
       }
       if (!isValidDateTimeStringFormat(string)) {
-        throw new Error('Invalid DateTime String: ' + string);
+        return null;
       }
       args = [years, months, days, hours, minutes, seconds, milliseconds];
       args = (function() {
@@ -619,21 +654,21 @@
       })(DateTime, args, function(){});
     };
 
-    DateTime.fromDate = function(date, timezoneOffset) {
+    DateTime.fromJSDate = function(date, timezoneOffset) {
       if (date instanceof DateTime) {
         return date;
       }
       if (timezoneOffset != null) {
-        date = new Date(date.getTime() + (timezoneOffset * 60 * 60 * 1000));
+        date = new jsDate(date.getTime() + (timezoneOffset * 60 * 60 * 1000));
         return new DateTime(date.getUTCFullYear(), date.getUTCMonth() + 1, date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), date.getUTCMilliseconds(), timezoneOffset);
       } else {
         return new DateTime(date.getFullYear(), date.getMonth() + 1, date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds());
       }
     };
 
-    function DateTime(year, month, day, hour, minute, second, millisecond, timezoneOffset1) {
-      this.year = year != null ? year : null;
-      this.month = month != null ? month : null;
+    function DateTime(year1, month1, day, hour, minute, second, millisecond, timezoneOffset1) {
+      this.year = year1 != null ? year1 : null;
+      this.month = month1 != null ? month1 : null;
       this.day = day != null ? day : null;
       this.hour = hour != null ? hour : null;
       this.minute = minute != null ? minute : null;
@@ -641,7 +676,7 @@
       this.millisecond = millisecond != null ? millisecond : null;
       this.timezoneOffset = timezoneOffset1;
       if (this.timezoneOffset == null) {
-        this.timezoneOffset = (new Date()).getTimezoneOffset() / 60 * -1;
+        this.timezoneOffset = (new jsDate()).getTimezoneOffset() / 60 * -1;
       }
     }
 
@@ -698,138 +733,19 @@
       if (timezoneOffset == null) {
         timezoneOffset = 0;
       }
-      d = DateTime.fromDate(this.toJSDate(), timezoneOffset);
+      d = DateTime.fromJSDate(this.toJSDate(), timezoneOffset);
       return d.reducedPrecision(this.getPrecision());
     };
 
-    DateTime.prototype.sameAs = function(other, precision) {
-      var diff;
-      if (precision == null) {
-        precision = DateTime.Unit.MILLISECOND;
-      }
-      if (!(other instanceof DateTime)) {
-        null;
-      }
-      diff = this.differenceBetween(other, precision);
-      switch (false) {
-        case !(diff.low === 0 && diff.high === 0):
-          return true;
-        case !(diff.low <= 0 && diff.high >= 0):
-          return null;
-        default:
-          return false;
-      }
-    };
-
-    DateTime.prototype.equals = function(other) {
-      return this.sameAs(other, DateTime.Unit.MILLISECOND);
-    };
-
-    DateTime.prototype.sameOrBefore = function(other, precision) {
-      var diff;
-      if (precision == null) {
-        precision = DateTime.Unit.MILLISECOND;
-      }
-      if (!(other instanceof DateTime)) {
-        return false;
-      }
-      diff = this.differenceBetween(other, precision);
-      switch (false) {
-        case !(diff.low >= 0 && diff.high >= 0):
-          return true;
-        case !(diff.low < 0 && diff.high < 0):
-          return false;
-        default:
-          return null;
-      }
-    };
-
-    DateTime.prototype.sameOrAfter = function(other, precision) {
-      var diff;
-      if (precision == null) {
-        precision = DateTime.Unit.MILLISECOND;
-      }
-      if (!(other instanceof DateTime)) {
-        return false;
-      }
-      diff = this.differenceBetween(other, precision);
-      switch (false) {
-        case !(diff.low <= 0 && diff.high <= 0):
-          return true;
-        case !(diff.low > 0 && diff.high > 0):
-          return false;
-        default:
-          return null;
-      }
-    };
-
-    DateTime.prototype.before = function(other, precision) {
-      var diff;
-      if (precision == null) {
-        precision = DateTime.Unit.MILLISECOND;
-      }
-      if (!(other instanceof DateTime)) {
-        return false;
-      }
-      diff = this.differenceBetween(other, precision);
-      switch (false) {
-        case !(diff.low > 0 && diff.high > 0):
-          return true;
-        case !(diff.low <= 0 && diff.high <= 0):
-          return false;
-        default:
-          return null;
-      }
-    };
-
-    DateTime.prototype.after = function(other, precision) {
-      var diff;
-      if (precision == null) {
-        precision = DateTime.Unit.MILLISECOND;
-      }
-      if (!(other instanceof DateTime)) {
-        return false;
-      }
-      diff = this.differenceBetween(other, precision);
-      switch (false) {
-        case !(diff.low < 0 && diff.high < 0):
-          return true;
-        case !(diff.low >= 0 && diff.high >= 0):
-          return false;
-        default:
-          return null;
-      }
-    };
-
-    DateTime.prototype.add = function(offset, field) {
-      var i, len, normalized, ref, result;
-      result = this.copy();
-      if (field === DateTime.Unit.WEEK) {
-        offset = offset * 7;
-        field = DateTime.Unit.DAY;
-      }
-      if (result[field] != null) {
-        result[field] = result[field] + offset;
-        normalized = DateTime.fromDate(result.toJSDate(), this.timezoneOffset);
-        ref = DateTime.FIELDS;
-        for (i = 0, len = ref.length; i < len; i++) {
-          field = ref[i];
-          if (result[field] != null) {
-            result[field] = normalized[field];
-          }
-        }
-      }
-      return result;
-    };
-
     DateTime.prototype.differenceBetween = function(other, unitField) {
       var a, aHighMoment, aJS, aLowMoment, aUncertainty, b, bHighMoment, bJS, bLowMoment, bUncertainty, tzDiff;
+      other = this._implicitlyConvert(other);
       if (!(other instanceof DateTime)) {
         return null;
       }
       a = this.copy();
       b = other.copy();
-      if (unitField === DateTime.Unit.MONTH || unitField === DateTime.Unit.YEAR) {
+      if (unitField === DateTime.Unit.MONTH || unitField === DateTime.Unit.YEAR || unitField === DateTime.Unit.WEEK || unitField === DateTime.Unit.DAY) {
         if (a.timezoneOffset !== b.timezoneOffset) {
           b = b.convertToTimezoneOffset(a.timezoneOffset);
         }
@@ -886,7 +802,7 @@
       if (d.day == null) {
         return d;
       }
-      floored = new Date(d.year, d.month - 1, d.day);
+      floored = new jsDate(d.year, d.month - 1, d.day);
       while (floored.getDay() > 0) {
         floored.setDate(floored.getDate() - 1);
       }
@@ -895,6 +811,7 @@
 
     DateTime.prototype.durationBetween = function(other, unitField) {
       var a, b;
+      other = this._implicitlyConvert(other);
       if (!(other instanceof DateTime)) {
         return null;
       }
@@ -924,7 +841,7 @@
         return truncFunc(msDiff / (7 * 24 * 60 * 60 * 1000));
       } else if (unitField === DateTime.Unit.MONTH || unitField === DateTime.Unit.YEAR) {
         months = (b.getFullYear() - a.getFullYear()) * 12 + (b.getMonth() - a.getMonth());
-        aInMonth = new Date(a.getTime());
+        aInMonth = new jsDate(a.getTime());
         aInMonthOriginalOffset = aInMonth.getTimezoneOffset();
         aInMonth.setMonth(a.getMonth() + months);
         if (aInMonthOriginalOffset !== aInMonth.getTimezoneOffset()) {
@@ -945,49 +862,6 @@
       }
     };
 
-    DateTime.prototype.isPrecise = function() {
-      return DateTime.FIELDS.every((function(_this) {
-        return function(field) {
-          return _this[field] != null;
-        };
-      })(this));
-    };
-
-    DateTime.prototype.isImprecise = function() {
-      return !this.isPrecise();
-    };
-
-    DateTime.prototype.isMorePrecise = function(other) {
-      var field, i, len, ref;
-      ref = DateTime.FIELDS;
-      for (i = 0, len = ref.length; i < len; i++) {
-        field = ref[i];
-        if ((other[field] != null) && (this[field] == null)) {
-          return false;
-        }
-      }
-      return !this.isSamePrecision(other);
-    };
-
-    DateTime.prototype.isLessPrecise = function(other) {
-      return !this.isSamePrecision(other) && !this.isMorePrecise(other);
-    };
-
-    DateTime.prototype.isSamePrecision = function(other) {
-      var field, i, len, ref;
-      ref = DateTime.FIELDS;
-      for (i = 0, len = ref.length; i < len; i++) {
-        field = ref[i];
-        if ((this[field] != null) && (other[field] == null)) {
-          return false;
-        }
-        if ((this[field] == null) && (other[field] != null)) {
-          return false;
-        }
-      }
-      return true;
-    };
-
     DateTime.prototype.isUTC = function() {
       return !this.timezoneOffset;
     };
@@ -1032,25 +906,25 @@
     };
 
     DateTime.prototype.toUncertainty = function(ignoreTimezone) {
-      var high, low, ref, ref1, ref2, ref3, ref4, ref5, ref6;
+      var high, low, ref1, ref2, ref3, ref4, ref5, ref6, ref7;
       if (ignoreTimezone == null) {
         ignoreTimezone = false;
       }
       low = this.toJSDate(ignoreTimezone);
-      high = (new DateTime(this.year, (ref = this.month) != null ? ref : 12, (ref1 = this.day) != null ? ref1 : (new Date(this.year, (ref2 = this.month) != null ? ref2 : 12, 0)).getDate(), (ref3 = this.hour) != null ? ref3 : 23, (ref4 = this.minute) != null ? ref4 : 59, (ref5 = this.second) != null ? ref5 : 59, (ref6 = this.millisecond) != null ? ref6 : 999, this.timezoneOffset)).toJSDate(ignoreTimezone);
+      high = (new DateTime(this.year, (ref1 = this.month) != null ? ref1 : 12, (ref2 = this.day) != null ? ref2 : (new jsDate(this.year, (ref3 = this.month) != null ? ref3 : 12, 0)).getDate(), (ref4 = this.hour) != null ? ref4 : 23, (ref5 = this.minute) != null ? ref5 : 59, (ref6 = this.second) != null ? ref6 : 59, (ref7 = this.millisecond) != null ? ref7 : 999, this.timezoneOffset)).toJSDate(ignoreTimezone);
       return new Uncertainty(low, high);
     };
 
     DateTime.prototype.toJSDate = function(ignoreTimezone) {
-      var d, h, mi, mo, ms, ref, ref1, ref2, ref3, ref4, ref5, s, y;
+      var d, h, mi, mo, ms, ref1, ref2, ref3, ref4, ref5, ref6, s, y;
       if (ignoreTimezone == null) {
         ignoreTimezone = false;
       }
-      ref5 = [this.year, (this.month != null ? this.month - 1 : 0), (ref = this.day) != null ? ref : 1, (ref1 = this.hour) != null ? ref1 : 0, (ref2 = this.minute) != null ? ref2 : 0, (ref3 = this.second) != null ? ref3 : 0, (ref4 = this.millisecond) != null ? ref4 : 0], y = ref5[0], mo = ref5[1], d = ref5[2], h = ref5[3], mi = ref5[4], s = ref5[5], ms = ref5[6];
+      ref6 = [this.year, (this.month != null ? this.month - 1 : 0), (ref1 = this.day) != null ? ref1 : 1, (ref2 = this.hour) != null ? ref2 : 0, (ref3 = this.minute) != null ? ref3 : 0, (ref4 = this.second) != null ? ref4 : 0, (ref5 = this.millisecond) != null ? ref5 : 0], y = ref6[0], mo = ref6[1], d = ref6[2], h = ref6[3], mi = ref6[4], s = ref6[5], ms = ref6[6];
       if ((this.timezoneOffset != null) && !ignoreTimezone) {
-        return new Date(Date.UTC(y, mo, d, h, mi, s, ms) - (this.timezoneOffset * 60 * 60 * 1000));
+        return new jsDate(jsDate.UTC(y, mo, d, h, mi, s, ms) - (this.timezoneOffset * 60 * 60 * 1000));
       } else {
-        return new Date(y, mo, d, h, mi, s, ms);
+        return new jsDate(y, mo, d, h, mi, s, ms);
       }
     };
 
@@ -1097,7 +971,7 @@
     };
 
     DateTime.prototype.getDate = function() {
-      return this.reducedPrecision(DateTime.Unit.DAY);
+      return new Date(this.year, this.month, this.day);
     };
 
     DateTime.prototype.getTime = function() {
@@ -1108,6 +982,13 @@
       return this.year === 0 && this.month === 1 && this.day === 1;
     };
 
+    DateTime.prototype._implicitlyConvert = function(other) {
+      if (other instanceof Date) {
+        return other.getDateTime();
+      }
+      return other;
+    };
+
     DateTime.prototype.reducedPrecision = function(unitField) {
       var field, fieldIndex, fieldsToRemove, i, len, reduced;
       if (unitField == null) {
@@ -1129,25 +1010,646 @@
 
   })();
 
-  normalizeMillisecondsFieldInString = function(string, matches) {
-    var beforeMs, msAndAfter, msString, ref, timezoneField, timezoneSeparator;
-    msString = matches[14];
-    msString = normalizeMillisecondsField(msString);
-    ref = string.split('.'), beforeMs = ref[0], msAndAfter = ref[1];
-    timezoneSeparator = getTimezoneSeparatorFromString(msAndAfter);
-    if (!!timezoneSeparator) {
-      timezoneField = msAndAfter != null ? msAndAfter.split(timezoneSeparator)[1] : void 0;
+  Date = (function() {
+    Date.Unit = {
+      YEAR: 'year',
+      MONTH: 'month',
+      WEEK: 'week',
+      DAY: 'day'
+    };
+
+    Date.FIELDS = [Date.Unit.YEAR, Date.Unit.MONTH, Date.Unit.DAY];
+
+    Date.parse = function(string) {
+      var arg, args, days, matches, months, years;
+      if (string === null) {
+        return null;
+      }
+      matches = /(\d{4})(-(\d{2}))?(-(\d{2}))?/.exec(string);
+      if (matches == null) {
+        return null;
+      }
+      years = matches[1];
+      months = matches[3];
+      days = matches[5];
+      if (!isValidDateStringFormat(string)) {
+        return null;
+      }
+      args = [years, months, days];
+      args = (function() {
+        var i, len, results;
+        results = [];
+        for (i = 0, len = args.length; i < len; i++) {
+          arg = args[i];
+          results.push(arg != null ? parseInt(arg, 10) : void 0);
+        }
+        return results;
+      })();
+      return (function(func, args, ctor) {
+        ctor.prototype = func.prototype;
+        var child = new ctor, result = func.apply(child, args);
+        return Object(result) === result ? result : child;
+      })(Date, args, function(){});
+    };
+
+    function Date(year1, month1, day) {
+      this.year = year1 != null ? year1 : null;
+      this.month = month1 != null ? month1 : null;
+      this.day = day != null ? day : null;
+      return;
     }
-    if (timezoneField == null) {
-      timezoneField = '';
+
+    Object.defineProperties(Date.prototype, {
+      isDate: {
+        get: function() {
+          return true;
+        }
+      }
+    });
+
+    Date.prototype.copy = function() {
+      return new Date(this.year, this.month, this.day);
+    };
+
+    Date.prototype.successor = function() {
+      if (this.day != null) {
+        return this.add(1, Date.Unit.DAY);
+      } else if (this.month != null) {
+        return this.add(1, Date.Unit.MONTH);
+      } else if (this.year != null) {
+        return this.add(1, Date.Unit.YEAR);
+      }
+    };
+
+    Date.prototype.predecessor = function() {
+      if (this.day != null) {
+        return this.add(-1, Date.Unit.DAY);
+      } else if (this.month != null) {
+        return this.add(-1, Date.Unit.MONTH);
+      } else if (this.year != null) {
+        return this.add(-1, Date.Unit.YEAR);
+      }
+    };
+
+    Date.prototype.differenceBetween = function(other, unitField) {
+      var a, b;
+      if (other instanceof DateTime) {
+        return this.getDateTime().differenceBetween(other, unitField);
+      }
+      if (!(other instanceof Date)) {
+        return null;
+      }
+      a = this;
+      b = other;
+      if (unitField === Date.Unit.YEAR) {
+        a = new Date(a.year, 1, 1);
+        b = new Date(b.year, 1, 1);
+      } else if (unitField === Date.Unit.MONTH) {
+        a = new Date(a.year, a.month, 1);
+        b = new Date(b.year, b.month, 1);
+      } else if (unitField === Date.Unit.WEEK) {
+        a = this._floorWeek(a);
+        b = this._floorWeek(b);
+      }
+      return a.durationBetween(b, unitField);
+    };
+
+    Date.prototype._floorWeek = function(d) {
+      var floored;
+      if (d.day == null) {
+        return d;
+      }
+      floored = new jsDate(d.year, d.month - 1, d.day);
+      while (floored.getDay() > 0) {
+        floored.setDate(floored.getDate() - 1);
+      }
+      return new Date(floored.getFullYear(), floored.getMonth() + 1, floored.getDate());
+    };
+
+    Date.prototype.durationBetween = function(other, unitField) {
+      var a, b;
+      if (other instanceof DateTime) {
+        return this.getDateTime().durationBetween(other, unitField);
+      }
+      if (!(other instanceof Date)) {
+        return null;
+      }
+      a = this.toUncertainty();
+      b = other.toUncertainty();
+      return new Uncertainty(this._durationBetweenDates(a.high, b.low, unitField), this._durationBetweenDates(a.low, b.high, unitField));
+    };
+
+    Date.prototype._durationBetweenDates = function(a, b, unitField) {
+      var aInMonth, aInMonthOriginalOffset, months, msDiff, truncFunc, tzdiff;
+      a.setTime(a.getTime() + (12 * 60 * 60 * 1000));
+      b.setTime(b.getTime() + (12 * 60 * 60 * 1000));
+      tzdiff = a.getTimezoneOffset() - b.getTimezoneOffset();
+      b.setTime(b.getTime() + (tzdiff * 60 * 1000));
+      msDiff = b.getTime() - a.getTime();
+      if (msDiff === 0) {
+        return 0;
+      }
+      truncFunc = msDiff > 0 ? Math.floor : Math.ceil;
+      if (unitField === Date.Unit.DAY) {
+        return truncFunc(msDiff / (24 * 60 * 60 * 1000));
+      } else if (unitField === Date.Unit.WEEK) {
+        return truncFunc(msDiff / (7 * 24 * 60 * 60 * 1000));
+      } else if (unitField === Date.Unit.MONTH || unitField === Date.Unit.YEAR) {
+        months = (b.getFullYear() - a.getFullYear()) * 12 + (b.getMonth() - a.getMonth());
+        aInMonth = new jsDate(a.getTime());
+        aInMonthOriginalOffset = aInMonth.getTimezoneOffset();
+        aInMonth.setMonth(a.getMonth() + months);
+        if (aInMonthOriginalOffset !== aInMonth.getTimezoneOffset()) {
+          aInMonth.setMinutes(aInMonth.getMinutes() + (aInMonthOriginalOffset - aInMonth.getTimezoneOffset()));
+        }
+        if (msDiff > 0 && aInMonth > b) {
+          months = months - 1;
+        } else if (msDiff < 0 && aInMonth < b) {
+          months = months + 1;
+        }
+        if (unitField === Date.Unit.MONTH) {
+          return months;
+        } else {
+          return truncFunc(months / 12);
+        }
+      } else {
+        return null;
+      }
+    };
+
+    Date.prototype.getPrecision = function() {
+      var result;
+      result = null;
+      if (this.year != null) {
+        result = Date.Unit.YEAR;
+      } else {
+        return result;
+      }
+      if (this.month != null) {
+        result = Date.Unit.MONTH;
+      } else {
+        return result;
+      }
+      if (this.day != null) {
+        result = Date.Unit.DAY;
+      } else {
+        return result;
+      }
+      return result;
+    };
+
+    Date.prototype.toUncertainty = function() {
+      var high, low, ref1, ref2, ref3;
+      low = this.toJSDate();
+      high = new Date(this.year, (ref1 = this.month) != null ? ref1 : 12, (ref2 = this.day) != null ? ref2 : (new jsDate(this.year, (ref3 = this.month) != null ? ref3 : 12, 0)).getDate()).toJSDate();
+      return new Uncertainty(low, high);
+    };
+
+    Date.prototype.toJSDate = function() {
+      var d, mo, ref1, ref2, y;
+      ref2 = [this.year, (this.month != null ? this.month - 1 : 0), (ref1 = this.day) != null ? ref1 : 1], y = ref2[0], mo = ref2[1], d = ref2[2];
+      return new jsDate(y, mo, d);
+    };
+
+    Date.fromJSDate = function(date) {
+      if (date instanceof Date) {
+        return date;
+      }
+      return new Date(date.getFullYear(), date.getMonth() + 1, date.getDate());
+    };
+
+    Date.prototype.toJSON = function() {
+      return this.toString();
+    };
+
+    Date.prototype.toString = function() {
+      var str;
+      str = '';
+      if (this.year != null) {
+        str += this.year.toString();
+        if (this.month != null) {
+          str += '-' + this.month.toString().padStart(2, "0");
+          if (this.day != null) {
+            str += '-' + this.day.toString().padStart(2, "0");
+          }
+        }
+      }
+      return str;
+    };
+
+    Date.prototype.getDateTime = function() {
+      if ((this.year != null) && (this.month != null) && (this.day != null)) {
+        return new DateTime(this.year, this.month, this.day, 0, 0, 0, 0);
+      } else {
+        return new DateTime(this.year, this.month, this.day);
+      }
+    };
+
+    Date.prototype.reducedPrecision = function(unitField) {
+      var field, fieldIndex, fieldsToRemove, i, len, reduced;
+      if (unitField == null) {
+        unitField = Date.Unit.DAY;
+      }
+      reduced = this.copy();
+      if (unitField !== Date.Unit.DAY) {
+        fieldIndex = Date.FIELDS.indexOf(unitField);
+        fieldsToRemove = Date.FIELDS.slice(fieldIndex + 1);
+        for (i = 0, len = fieldsToRemove.length; i < len; i++) {
+          field = fieldsToRemove[i];
+          reduced[field] = null;
+        }
+      }
+      return reduced;
+    };
+
+    return Date;
+
+  })();
+
+  DateTime.prototype.isPrecise = Date.prototype.isPrecise = function() {
+    return this.constructor.FIELDS.every((function(_this) {
+      return function(field) {
+        return _this[field] != null;
+      };
+    })(this));
+  };
+
+  DateTime.prototype.isImprecise = Date.prototype.isImprecise = function() {
+    return !this.isPrecise();
+  };
+
+  DateTime.prototype.isMorePrecise = Date.prototype.isMorePrecise = function(other) {
+    var field, i, len, ref1;
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((other[field] != null) && (this[field] == null)) {
+        return false;
+      }
     }
-    return string = beforeMs + '.' + msString + timezoneSeparator + timezoneField;
+    return !this.isSamePrecision(other);
+  };
+
+  DateTime.prototype.isLessPrecise = Date.prototype.isLessPrecise = function(other) {
+    return !this.isSamePrecision(other) && !this.isMorePrecise(other);
+  };
+
+  DateTime.prototype.isSamePrecision = Date.prototype.isSamePrecision = function(other) {
+    var field, i, len, ref1;
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((this[field] != null) && (other[field] == null)) {
+        return false;
+      }
+      if ((this[field] == null) && (other[field] != null)) {
+        return false;
+      }
+    }
+    return true;
+  };
+
+  DateTime.prototype.equals = Date.prototype.equals = function(other) {
+    var field, i, len, ref1;
+    if (!((this.isDate && other.isDate) || (this.isDateTime && other.isDateTime))) {
+      return false;
+    }
+    if (this.timezoneOffset !== other.timezoneOffset) {
+      other = other.convertToTimezoneOffset(this.timezoneOffset);
+    }
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((this[field] != null) && (other[field] != null)) {
+        if (this[field] !== other[field]) {
+          return false;
+        }
+      } else if ((this[field] == null) && (other[field] == null)) {
+        return true;
+      } else {
+        return null;
+      }
+    }
+    return true;
+  };
+
+  DateTime.prototype.sameAs = Date.prototype.sameAs = function(other, precision) {
+    var field, i, len, ref1;
+    if (!(other.isDate || other.isDateTime)) {
+      return null;
+    } else if (this.isDate && other.isDateTime) {
+      return this.getDateTime().sameAs(other, precision);
+    } else if (this.isDateTime && other.isDate) {
+      other = other.getDateTime();
+    }
+    if ((precision != null) && this.constructor.FIELDS.indexOf(precision) < 0) {
+      throw new Error("Invalid precision: " + precision);
+    }
+    if (this.timezoneOffset !== other.timezoneOffset) {
+      other = other.convertToTimezoneOffset(this.timezoneOffset);
+    }
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((this[field] != null) && (other[field] != null)) {
+        if (this[field] !== other[field]) {
+          return false;
+        }
+      } else if ((this[field] == null) && (other[field] == null)) {
+        if (precision == null) {
+          return true;
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
+      if ((precision != null) && precision === field) {
+        break;
+      }
+    }
+    return true;
+  };
+
+  DateTime.prototype.sameOrBefore = Date.prototype.sameOrBefore = function(other, precision) {
+    var field, i, len, ref1;
+    if (!(other.isDate || other.isDateTime)) {
+      return null;
+    } else if (this.isDate && other.isDateTime) {
+      return this.getDateTime().sameOrBefore(other, precision);
+    } else if (this.isDateTime && other.isDate) {
+      other = other.getDateTime();
+    }
+    if ((precision != null) && this.constructor.FIELDS.indexOf(precision) < 0) {
+      throw new Error("Invalid precision: " + precision);
+    }
+    if (this.timezoneOffset !== other.timezoneOffset) {
+      other = other.convertToTimezoneOffset(this.timezoneOffset);
+    }
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((this[field] != null) && (other[field] != null)) {
+        if (this[field] < other[field]) {
+          return true;
+        } else if (this[field] > other[field]) {
+          return false;
+        }
+      } else if ((this[field] == null) && (other[field] == null)) {
+        if (precision == null) {
+          return true;
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
+      if ((precision != null) && precision === field) {
+        break;
+      }
+    }
+    return true;
+  };
+
+  DateTime.prototype.sameOrAfter = Date.prototype.sameOrAfter = function(other, precision) {
+    var field, i, len, ref1;
+    if (!(other.isDate || other.isDateTime)) {
+      return null;
+    } else if (this.isDate && other.isDateTime) {
+      return this.getDateTime().sameOrAfter(other, precision);
+    } else if (this.isDateTime && other.isDate) {
+      other = other.getDateTime();
+    }
+    if ((precision != null) && this.constructor.FIELDS.indexOf(precision) < 0) {
+      throw new Error("Invalid precision: " + precision);
+    }
+    if (this.timezoneOffset !== other.timezoneOffset) {
+      other = other.convertToTimezoneOffset(this.timezoneOffset);
+    }
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((this[field] != null) && (other[field] != null)) {
+        if (this[field] > other[field]) {
+          return true;
+        } else if (this[field] < other[field]) {
+          return false;
+        }
+      } else if ((this[field] == null) && (other[field] == null)) {
+        if (precision == null) {
+          return true;
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
+      if ((precision != null) && precision === field) {
+        break;
+      }
+    }
+    return true;
+  };
+
+  DateTime.prototype.before = Date.prototype.before = function(other, precision) {
+    var field, i, len, ref1;
+    if (!(other.isDate || other.isDateTime)) {
+      return null;
+    } else if (this.isDate && other.isDateTime) {
+      return this.getDateTime().before(other, precision);
+    } else if (this.isDateTime && other.isDate) {
+      other = other.getDateTime();
+    }
+    if ((precision != null) && this.constructor.FIELDS.indexOf(precision) < 0) {
+      throw new Error("Invalid precision: " + precision);
+    }
+    if (this.timezoneOffset !== other.timezoneOffset) {
+      other = other.convertToTimezoneOffset(this.timezoneOffset);
+    }
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((this[field] != null) && (other[field] != null)) {
+        if (this[field] < other[field]) {
+          return true;
+        } else if (this[field] > other[field]) {
+          return false;
+        }
+      } else if ((this[field] == null) && (other[field] == null)) {
+        if (precision == null) {
+          return false;
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
+      if ((precision != null) && precision === field) {
+        break;
+      }
+    }
+    return false;
+  };
+
+  DateTime.prototype.after = Date.prototype.after = function(other, precision) {
+    var field, i, len, ref1;
+    if (!(other.isDate || other.isDateTime)) {
+      return null;
+    } else if (this.isDate && other.isDateTime) {
+      return this.getDateTime().after(other, precision);
+    } else if (this.isDateTime && other.isDate) {
+      other = other.getDateTime();
+    }
+    if ((precision != null) && this.constructor.FIELDS.indexOf(precision) < 0) {
+      throw new Error("Invalid precision: " + precision);
+    }
+    if (this.timezoneOffset !== other.timezoneOffset) {
+      other = other.convertToTimezoneOffset(this.timezoneOffset);
+    }
+    ref1 = this.constructor.FIELDS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      field = ref1[i];
+      if ((this[field] != null) && (other[field] != null)) {
+        if (this[field] > other[field]) {
+          return true;
+        } else if (this[field] < other[field]) {
+          return false;
+        }
+      } else if ((this[field] == null) && (other[field] == null)) {
+        if (precision == null) {
+          return false;
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
+      if ((precision != null) && precision === field) {
+        break;
+      }
+    }
+    return false;
+  };
+
+  DateTime.prototype.add = Date.prototype.add = function(offset, field) {
+    var f, fieldFloorOrCiel, i, j, k, len, len1, len2, normalized, offsetIsMorePrecise, ref1, ref2, ref3, ref4, result;
+    result = this.copy();
+    if (offset === 0) {
+      return result;
+    }
+    if (field === this.constructor.Unit.WEEK) {
+      offset = offset * 7;
+      field = this.constructor.Unit.DAY;
+    }
+    offsetIsMorePrecise = result[field] == null;
+    if (offsetIsMorePrecise) {
+      if (!this.year) {
+        result.year = new jsDate().getFullYear();
+      }
+      fieldFloorOrCiel = offset >= 0 ? this.getFieldFloor : this.getFieldCieling;
+      ref1 = this.constructor.FIELDS;
+      for (i = 0, len = ref1.length; i < len; i++) {
+        f = ref1[i];
+        result[f] = (ref2 = result[f]) != null ? ref2 : fieldFloorOrCiel.call(result, f);
+        if (result[field] != null) {
+          break;
+        }
+      }
+    }
+    result[field] = result[field] + offset;
+    normalized = this.constructor.fromJSDate(result.toJSDate(), this.timezoneOffset);
+    ref3 = this.constructor.FIELDS;
+    for (j = 0, len1 = ref3.length; j < len1; j++) {
+      field = ref3[j];
+      if (result[field] != null) {
+        result[field] = normalized[field];
+      }
+    }
+    if (offsetIsMorePrecise) {
+      ref4 = this.constructor.FIELDS;
+      for (k = 0, len2 = ref4.length; k < len2; k++) {
+        f = ref4[k];
+        if (this[f] == null) {
+          result[f] = null;
+        }
+      }
+    }
+    return result;
+  };
+
+  DateTime.prototype.getFieldFloor = Date.prototype.getFieldFloor = function(field) {
+    if (field === 'month') {
+      return 1;
+    }
+    if (field === 'day') {
+      return 1;
+    }
+    if (field === 'hour') {
+      return 0;
+    }
+    if (field === 'minute') {
+      return 0;
+    }
+    if (field === 'second') {
+      return 0;
+    }
+    if (field === 'millisecond') {
+      return 0;
+    }
+    throw new Error('Tried to floor a field that has no floor value: ' + field);
+  };
+
+  DateTime.prototype.getFieldCieling = Date.prototype.getFieldCieling = function(field) {
+    if (field === 'month') {
+      return 12;
+    }
+    if (field === 'day') {
+      return daysInMonth(this.year, this.month);
+    }
+    if (field === 'hour') {
+      return 23;
+    }
+    if (field === 'minute') {
+      return 59;
+    }
+    if (field === 'second') {
+      return 59;
+    }
+    if (field === 'millisecond') {
+      return 999;
+    }
+    throw new Error('Tried to clieling a field that has no cieling value: ' + field);
+  };
+
+  daysInMonth = function(year, month) {
+    if (!((year != null) && (month != null))) {
+      throw new Error('daysInMonth requires year and month as arguments');
+    }
+    return new jsDate(year, month, 0).getDate();
   };
 
   normalizeMillisecondsField = function(msString) {
     return msString = (msString + "00").substring(0, 3);
   };
 
+  isValidDateStringFormat = function(string) {
+    var cqlFormatStringWithLength, cqlFormats, format, i, len, strict;
+    if (typeof string !== 'string') {
+      return false;
+    }
+    cqlFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD'];
+    cqlFormatStringWithLength = {};
+    for (i = 0, len = cqlFormats.length; i < len; i++) {
+      format = cqlFormats[i];
+      cqlFormatStringWithLength[format.length] = format;
+    }
+    if (cqlFormatStringWithLength[string.length] == null) {
+      return false;
+    }
+    strict = true;
+    return moment(string, cqlFormatStringWithLength[string.length], strict).isValid();
+  };
+
   isValidDateTimeStringFormat = function(string) {
     var cqlFormatStringWithLength, cqlFormats, format, i, len, strict;
     if (typeof string !== 'string') {
@@ -1167,8 +1669,8 @@
   };
 
   cqlFormatStringToMomentFormatString = function(string) {
-    var momentString, ref, timeAndTimeZoneOffset, timezoneSeparator, yearMonthDay;
-    ref = string.split('T'), yearMonthDay = ref[0], timeAndTimeZoneOffset = ref[1];
+    var momentString, ref1, timeAndTimeZoneOffset, timezoneSeparator, yearMonthDay;
+    ref1 = string.split('T'), yearMonthDay = ref1[0], timeAndTimeZoneOffset = ref1[1];
     if (timeAndTimeZoneOffset != null) {
       timezoneSeparator = getTimezoneSeparatorFromString(timeAndTimeZoneOffset);
     }
@@ -1184,22 +1686,15 @@
     return momentString = momentString.replace(/f/g, 'S');
   };
 
-  getTimezoneSeparatorFromString = function(string) {
-    var ref, ref1, timezoneSeparator;
-    if ((string != null ? (ref = string.match(/-/)) != null ? ref.length : void 0 : void 0) === 1) {
-      return timezoneSeparator = '-';
-    } else if ((string != null ? (ref1 = string.match(/\+/)) != null ? ref1.length : void 0 : void 0) === 1) {
-      return timezoneSeparator = '+';
-    } else {
-      return timezoneSeparator = '';
-    }
-  };
+  module.exports.DateTime = DateTime;
+
+  module.exports.Date = Date;
 
 }).call(this);
 
 
 
-},{"./uncertainty":11,"moment":136}],8:[function(require,module,exports){
+},{"../util/util":136,"./uncertainty":11,"moment":137}],8:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Exception;
@@ -1255,10 +1750,10 @@
       var newHigh, newLow;
       newLow = this.low;
       newHigh = this.high;
-      if (typeof this.low.copy === 'function') {
+      if ((this.low != null) && typeof this.low.copy === 'function') {
         newLow = this.low.copy();
       }
-      if (typeof this.high.copy === 'function') {
+      if ((this.high != null) && typeof this.high.copy === 'function') {
         newHigh = this.high.copy();
       }
       return new Interval(newLow, newHigh, this.lowClosed, this.highClosed);
@@ -1283,18 +1778,19 @@
     Interval.prototype.includes = function(other, precision) {
       var a, b;
       if (!(other instanceof Interval)) {
-        throw new Error("Argument to includes must be an interval");
+        return this.contains(other, precision);
       }
       a = this.toClosed();
       b = other.toClosed();
       return ThreeValuedLogic.and(cmp.lessThanOrEquals(a.low, b.low, precision), cmp.greaterThanOrEquals(a.high, b.high, precision));
     };
 
-    Interval.prototype.includedIn = function(other) {
+    Interval.prototype.includedIn = function(other, precision) {
       if (!(other instanceof Interval)) {
-        throw new Error("Argument to includedIn must be an interval");
+        return this.contains(other, precision);
+      } else {
+        return other.includes(this);
       }
-      return other.includes(this);
     };
 
     Interval.prototype.overlaps = function(item, precision) {
@@ -1612,7 +2108,7 @@
 
 
 
-},{"../util/comparison":133,"../util/math":134,"./datetime":7,"./logic":10,"./uncertainty":11}],10:[function(require,module,exports){
+},{"../util/comparison":134,"../util/math":135,"./datetime":7,"./logic":10,"./uncertainty":11}],10:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var ThreeValuedLogic,
@@ -1803,7 +2299,7 @@
 },{"./logic":10}],12:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var AggregateExpression, AllTrue, AnyTrue, Avg, Count, Exception, Expression, Max, Median, Min, Mode, PopulationStdDev, PopulationVariance, Quantity, StdDev, Sum, Variance, allTrue, anyTrue, build, compact, numerical_sort, quantitiesOrArg, quantityOrValue, ref, typeIsArray,
+  var AggregateExpression, AllTrue, AnyTrue, Avg, Count, Exception, Expression, GeometricMean, Max, Median, Min, Mode, PopulationStdDev, PopulationVariance, Product, Quantity, StdDev, Sum, Variance, allTrue, anyTrue, build, compact, numerical_sort, productValue, quantitiesOrArg, quantityOrValue, ref, typeIsArray,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
@@ -2100,6 +2596,77 @@
 
   })(AggregateExpression);
 
+  module.exports.Product = Product = (function(superClass) {
+    extend(Product, superClass);
+
+    function Product(json) {
+      Product.__super__.constructor.apply(this, arguments);
+    }
+
+    Product.prototype.exec = function(ctx) {
+      var filtered, listOfValues, product, ref1;
+      listOfValues = this.source.execute(ctx);
+      if (listOfValues === null) {
+        return null;
+      }
+      ref1 = productValue(listOfValues), product = ref1[0], filtered = ref1[1];
+      if (product === null) {
+        return null;
+      }
+      return quantityOrValue(product, listOfValues);
+    };
+
+    return Product;
+
+  })(AggregateExpression);
+
+  module.exports.GeometricMean = GeometricMean = (function(superClass) {
+    extend(GeometricMean, superClass);
+
+    function GeometricMean(json) {
+      GeometricMean.__super__.constructor.apply(this, arguments);
+    }
+
+    GeometricMean.prototype.exec = function(ctx) {
+      var filtered, geoMean, listOfValues, product, ref1;
+      listOfValues = this.source.execute(ctx);
+      if (listOfValues === null) {
+        return null;
+      }
+      ref1 = productValue(listOfValues), product = ref1[0], filtered = ref1[1];
+      if (product === null) {
+        return null;
+      }
+      geoMean = Math.pow(product, 1.0 / filtered.length);
+      return geoMean;
+    };
+
+    return GeometricMean;
+
+  })(AggregateExpression);
+
+  productValue = function(list) {
+    var filtered, item, j, len, product;
+    product = 1;
+    if (typeIsArray(list)) {
+      filtered = compact(list);
+      if (filtered.length === 0) {
+        return [null, null];
+      }
+      for (j = 0, len = filtered.length; j < len; j++) {
+        item = filtered[j];
+        if (item.isQuantity) {
+          product = Quantity.doMultiplication(product, item);
+        } else {
+          product = product * item;
+        }
+      }
+      return [product, filtered];
+    } else {
+      return [null, null];
+    }
+  };
+
   module.exports.PopulationStdDev = PopulationStdDev = (function(superClass) {
     extend(PopulationStdDev, superClass);
 
@@ -2174,7 +2741,7 @@
 
 
 
-},{"../datatypes/exception":8,"../util/util":135,"./builder":14,"./expression":20,"./quantity":32}],13:[function(require,module,exports){
+},{"../datatypes/exception":8,"../util/util":136,"./builder":14,"./expression":20,"./quantity":32}],13:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Abs, Add, Ceiling, Divide, Exp, Expression, Floor, Ln, Log, MathUtil, MaxValue, MinValue, Modulo, Multiply, Negate, Power, Predecessor, Quantity, Round, Subtract, Successor, Truncate, TruncatedDivide, allTrue, anyTrue, build, ref, typeIsArray,
@@ -2207,7 +2774,7 @@
         return null;
       } else {
         return args != null ? args.reduce(function(x, y) {
-          if (x.isQuantity || x.isDateTime) {
+          if (x.isQuantity || x.isDateTime || x.isDate) {
             return Quantity.doAddition(x, y);
           } else {
             return x + y;
@@ -2236,7 +2803,7 @@
         return null;
       } else {
         return args.reduce(function(x, y) {
-          if (x.isQuantity || x.isDateTime) {
+          if (x.isQuantity || x.isDateTime || x.isDate) {
             return Quantity.doSubtraction(x, y);
           } else {
             return x - y;
@@ -2681,7 +3248,7 @@
 
 
 
-},{"../util/math":134,"../util/util":135,"./builder":14,"./expression":20,"./quantity":32}],14:[function(require,module,exports){
+},{"../util/math":135,"../util/util":136,"./builder":14,"./expression":20,"./quantity":32}],14:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var E, build, constructByName, functionExists, typeIsArray;
@@ -2729,10 +3296,10 @@
 
 
 
-},{"../util/util":135,"./expressions":21}],15:[function(require,module,exports){
+},{"../util/util":136,"./expressions":21}],15:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var CalculateAge, CalculateAgeAt, CodeDef, CodeRef, CodeSystemDef, Concept, ConceptDef, ConceptRef, Expression, InValueSet, ValueSetDef, ValueSetRef, build, dt,
+  var AnyInValueSet, CalculateAge, CalculateAgeAt, CodeDef, CodeRef, CodeSystemDef, Concept, ConceptDef, ConceptRef, Expression, InValueSet, ValueSetDef, ValueSetRef, build, dt,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -2784,6 +3351,35 @@
 
   })(Expression);
 
+  module.exports.AnyInValueSet = AnyInValueSet = (function(superClass) {
+    extend(AnyInValueSet, superClass);
+
+    function AnyInValueSet(json) {
+      AnyInValueSet.__super__.constructor.apply(this, arguments);
+      this.codes = build(json.codes);
+      this.valueset = new ValueSetRef(json.valueset);
+    }
+
+    AnyInValueSet.prototype.exec = function(ctx) {
+      var code, codes, i, len, valueset;
+      valueset = this.valueset.execute(ctx);
+      if (!((valueset != null) && valueset.isValueSet)) {
+        throw new Error("ValueSet must be provided to InValueSet function");
+      }
+      codes = this.codes.exec(ctx);
+      for (i = 0, len = codes.length; i < len; i++) {
+        code = codes[i];
+        if (valueset.hasMatch(code)) {
+          return true;
+        }
+      }
+      return false;
+    };
+
+    return AnyInValueSet;
+
+  })(Expression);
+
   module.exports.InValueSet = InValueSet = (function(superClass) {
     extend(InValueSet, superClass);
 
@@ -2806,7 +3402,7 @@
         return false;
       }
       valueset = this.valueset.execute(ctx);
-      if (valueset == null) {
+      if (!((valueset != null) && valueset.isValueSet)) {
         throw new Error("ValueSet must be provided to InValueSet function");
       }
       return valueset.hasMatch(code);
@@ -2973,7 +3569,7 @@
     CalculateAge.prototype.exec = function(ctx) {
       var date1, date2, result;
       date1 = this.execArgs(ctx);
-      date2 = dt.DateTime.fromDate(ctx.getExecutionDateTime());
+      date2 = dt.DateTime.fromJSDate(ctx.getExecutionDateTime());
       result = date1 != null ? date1.durationBetween(date2, this.precision.toLowerCase()) : void 0;
       if ((result != null) && result.isPoint()) {
         return result.low;
@@ -3020,7 +3616,7 @@
 },{"../datatypes/datatypes":6,"./builder":14,"./expression":20}],16:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Expression, Greater, GreaterOrEqual, IncompatibleTypesException, Less, LessOrEqual, Uncertainty,
+  var Expression, Greater, GreaterOrEqual, Less, LessOrEqual, Uncertainty,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -3028,8 +3624,6 @@
 
   Uncertainty = require('../datatypes/datatypes').Uncertainty;
 
-  IncompatibleTypesException = require('./quantity').IncompatibleTypesException;
-
   module.exports.Less = Less = (function(superClass) {
     extend(Less, superClass);
 
@@ -3122,7 +3716,7 @@
 
 
 
-},{"../datatypes/datatypes":6,"./expression":20,"./quantity":32}],17:[function(require,module,exports){
+},{"../datatypes/datatypes":6,"./expression":20}],17:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Case, CaseItem, Expression, If, build, equals,
@@ -3228,10 +3822,10 @@
 
 
 
-},{"../util/comparison":133,"./builder":14,"./expression":20}],18:[function(require,module,exports){
+},{"../util/comparison":134,"./builder":14,"./expression":20}],18:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DT, DateFrom, DateTime, DateTimeComponentFrom, DifferenceBetween, DurationBetween, Expression, Literal, Now, SameAs, SameOrAfter, SameOrBefore, Time, TimeFrom, TimeOfDay, TimezoneFrom, Today, build,
+  var DT, Date, DateFrom, DateTime, DateTimeComponentFrom, DifferenceBetween, DurationBetween, Expression, Literal, Now, SameAs, SameOrAfter, SameOrBefore, Time, TimeFrom, TimeOfDay, TimezoneFrom, Today, build,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty,
     slice = [].slice;
@@ -3298,6 +3892,54 @@
 
   })(Expression);
 
+  module.exports.Date = Date = (function(superClass) {
+    extend(Date, superClass);
+
+    Date.PROPERTIES = ['year', 'month', 'day'];
+
+    function Date(json1) {
+      this.json = json1;
+      Date.__super__.constructor.apply(this, arguments);
+    }
+
+    Object.defineProperties(Date.prototype, {
+      isDate: {
+        get: function() {
+          return true;
+        }
+      }
+    });
+
+    Date.prototype.exec = function(ctx) {
+      var args, i, len, p, property, ref;
+      ref = Date.PROPERTIES;
+      for (i = 0, len = ref.length; i < len; i++) {
+        property = ref[i];
+        if (this.json[property] != null) {
+          this[property] = build(this.json[property]);
+        }
+      }
+      args = (function() {
+        var j, len1, ref1, results;
+        ref1 = Date.PROPERTIES;
+        results = [];
+        for (j = 0, len1 = ref1.length; j < len1; j++) {
+          p = ref1[j];
+          results.push(this[p] != null ? this[p].execute(ctx) : void 0);
+        }
+        return results;
+      }).call(this);
+      return (function(func, args, ctor) {
+        ctor.prototype = func.prototype;
+        var child = new ctor, result = func.apply(child, args);
+        return Object(result) === result ? result : child;
+      })(DT.Date, args, function(){});
+    };
+
+    return Date;
+
+  })(Expression);
+
   module.exports.Time = Time = (function(superClass) {
     extend(Time, superClass);
 
@@ -3736,10 +4378,10 @@
 
 
 
-},{"../util/util":135,"./builder":14}],21:[function(require,module,exports){
+},{"../util/util":136,"./builder":14}],21:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var aggregate, arithmetic, clinical, comparison, conditional, datetime, declaration, element, expression, external, i, instance, interval, j, len, len1, lib, libs, list, literal, logical, nullological, overloaded, parameters, quantity, query, ref, reusable, string, structured, type;
+  var aggregate, arithmetic, clinical, comparison, conditional, datetime, declaration, element, expression, external, i, instance, interval, j, len, len1, lib, libs, list, literal, logical, nullological, overloaded, parameters, quantity, query, ratio, ref, reusable, string, structured, type;
 
   expression = require('./expression');
 
@@ -3777,6 +4419,8 @@
 
   query = require('./query');
 
+  ratio = require('./ratio');
+
   reusable = require('./reusable');
 
   string = require('./string');
@@ -3787,7 +4431,7 @@
 
   overloaded = require('./overloaded');
 
-  libs = [expression, aggregate, arithmetic, clinical, comparison, conditional, datetime, declaration, external, instance, interval, list, literal, logical, nullological, parameters, query, quantity, reusable, string, structured, type, overloaded];
+  libs = [expression, aggregate, arithmetic, clinical, comparison, conditional, datetime, declaration, external, instance, interval, list, literal, logical, nullological, parameters, query, quantity, ratio, reusable, string, structured, type, overloaded];
 
   for (i = 0, len = libs.length; i < len; i++) {
     lib = libs[i];
@@ -3802,7 +4446,7 @@
 
 
 
-},{"./aggregate":12,"./arithmetic":13,"./clinical":15,"./comparison":16,"./conditional":17,"./datetime":18,"./declaration":19,"./expression":20,"./external":22,"./instance":23,"./interval":24,"./list":26,"./literal":27,"./logical":28,"./nullological":29,"./overloaded":30,"./parameters":31,"./quantity":32,"./query":33,"./reusable":34,"./string":35,"./structured":36,"./type":37}],22:[function(require,module,exports){
+},{"./aggregate":12,"./arithmetic":13,"./clinical":15,"./comparison":16,"./conditional":17,"./datetime":18,"./declaration":19,"./expression":20,"./external":22,"./instance":23,"./interval":24,"./list":26,"./literal":27,"./logical":28,"./nullological":29,"./overloaded":30,"./parameters":31,"./quantity":32,"./query":33,"./ratio":34,"./reusable":35,"./string":36,"./structured":37,"./type":38}],22:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Expression, Retrieve, build, typeIsArray,
@@ -3879,7 +4523,7 @@
 
 
 
-},{"../util/util":135,"./builder":14,"./expression":20}],23:[function(require,module,exports){
+},{"../util/util":136,"./builder":14,"./expression":20}],23:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Code, Concept, Element, Expression, Instance, Quantity, build, ref,
@@ -3959,7 +4603,7 @@
 },{"../datatypes/datatypes":6,"./builder":14,"./expression":20,"./quantity":32}],24:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Collapse, End, Ends, Expression, Interval, Meets, MeetsAfter, MeetsBefore, Overlaps, OverlapsAfter, OverlapsBefore, Start, Starts, ThreeValuedLogic, UnimplementedExpression, Width, build, cmp, doIncludes, dtivl, ref,
+  var Collapse, End, Ends, Expression, Interval, Meets, MeetsAfter, MeetsBefore, Overlaps, OverlapsAfter, OverlapsBefore, Quantity, Start, Starts, ThreeValuedLogic, UnimplementedExpression, Width, build, cmp, doAddition, doIncludes, doSubtraction, dtivl, predecessor, ref, ref1, ref2, successor,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -3969,6 +4613,10 @@
 
   build = require('./builder').build;
 
+  ref1 = require('./quantity'), Quantity = ref1.Quantity, doAddition = ref1.doAddition, doSubtraction = ref1.doSubtraction;
+
+  ref2 = require('../util/math'), successor = ref2.successor, predecessor = ref2.predecessor;
+
   dtivl = require('../datatypes/interval');
 
   cmp = require('../util/comparison');
@@ -4024,14 +4672,14 @@
     extend(Meets, superClass);
 
     function Meets(json) {
-      var ref1;
+      var ref3;
       Meets.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     Meets.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.meets(b, this.precision);
       } else {
@@ -4047,14 +4695,14 @@
     extend(MeetsAfter, superClass);
 
     function MeetsAfter(json) {
-      var ref1;
+      var ref3;
       MeetsAfter.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     MeetsAfter.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.meetsAfter(b, this.precision);
       } else {
@@ -4070,14 +4718,14 @@
     extend(MeetsBefore, superClass);
 
     function MeetsBefore(json) {
-      var ref1;
+      var ref3;
       MeetsBefore.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     MeetsBefore.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.meetsBefore(b, this.precision);
       } else {
@@ -4093,14 +4741,14 @@
     extend(Overlaps, superClass);
 
     function Overlaps(json) {
-      var ref1;
+      var ref3;
       Overlaps.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     Overlaps.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.overlaps(b, this.precision);
       } else {
@@ -4116,14 +4764,14 @@
     extend(OverlapsAfter, superClass);
 
     function OverlapsAfter(json) {
-      var ref1;
+      var ref3;
       OverlapsAfter.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     OverlapsAfter.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.overlapsAfter(b, this.precision);
       } else {
@@ -4139,14 +4787,14 @@
     extend(OverlapsBefore, superClass);
 
     function OverlapsBefore(json) {
-      var ref1;
+      var ref3;
       OverlapsBefore.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     OverlapsBefore.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.overlapsBefore(b, this.precision);
       } else {
@@ -4186,8 +4834,8 @@
     }
 
     Width.prototype.exec = function(ctx) {
-      var ref1;
-      return (ref1 = this.arg.execute(ctx)) != null ? ref1.width() : void 0;
+      var ref3;
+      return (ref3 = this.arg.execute(ctx)) != null ? ref3.width() : void 0;
     };
 
     return Width;
@@ -4202,8 +4850,8 @@
     }
 
     Start.prototype.exec = function(ctx) {
-      var ref1;
-      return (ref1 = this.arg.execute(ctx)) != null ? ref1.low : void 0;
+      var ref3;
+      return (ref3 = this.arg.execute(ctx)) != null ? ref3.low : void 0;
     };
 
     return Start;
@@ -4218,8 +4866,8 @@
     }
 
     End.prototype.exec = function(ctx) {
-      var ref1;
-      return (ref1 = this.arg.execute(ctx)) != null ? ref1.high : void 0;
+      var ref3;
+      return (ref3 = this.arg.execute(ctx)) != null ? ref3.high : void 0;
     };
 
     return End;
@@ -4230,14 +4878,14 @@
     extend(Starts, superClass);
 
     function Starts(json) {
-      var ref1;
+      var ref3;
       Starts.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     Starts.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.starts(b, this.precision);
       } else {
@@ -4253,14 +4901,14 @@
     extend(Ends, superClass);
 
     function Ends(json) {
-      var ref1;
+      var ref3;
       Ends.__super__.constructor.apply(this, arguments);
-      this.precision = (ref1 = json.precision) != null ? ref1.toLowerCase() : void 0;
+      this.precision = (ref3 = json.precision) != null ? ref3.toLowerCase() : void 0;
     }
 
     Ends.prototype.exec = function(ctx) {
-      var a, b, ref1;
-      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      var a, b, ref3;
+      ref3 = this.execArgs(ctx), a = ref3[0], b = ref3[1];
       if ((a != null) && (b != null)) {
         return a.ends(b, this.precision);
       } else {
@@ -4280,48 +4928,115 @@
     }
 
     Collapse.prototype.exec = function(ctx) {
-      var a, b, base, base1, collapsedIntervals, i, intervals, len;
-      intervals = this.execArgs(ctx);
-      if ((intervals != null ? intervals.length : void 0) <= 1) {
-        return intervals;
+      var a, b, collapsedIntervals, i, interval, intervals, intervalsClone, len, perWidth, precisionUnits, ref3, ref4, ref5, ref6, ref7;
+      ref3 = this.execArgs(ctx), intervals = ref3[0], perWidth = ref3[1];
+      intervalsClone = [];
+      for (i = 0, len = intervals.length; i < len; i++) {
+        interval = intervals[i];
+        if (interval != null) {
+          intervalsClone.push(interval.copy());
+        }
+      }
+      if (intervals == null) {
+        return null;
+      } else if ((intervalsClone != null ? intervalsClone.length : void 0) <= 1) {
+        return intervalsClone;
       } else {
-        for (i = 0, len = intervals.length; i < len; i++) {
-          a = intervals[i];
-          if ((typeof (base = a.low).isImprecise === "function" ? base.isImprecise() : void 0) || (typeof (base1 = a.high).isImprecise === "function" ? base1.isImprecise() : void 0)) {
-            throw new Error("Collapse does not support imprecise dates at this time.");
+        if (perWidth == null) {
+          if (intervalsClone[0].low != null) {
+            if (intervalsClone[0].low.isDateTime) {
+              precisionUnits = intervalsClone[0].low.getPrecision();
+              perWidth = new Quantity({
+                value: 1,
+                unit: precisionUnits
+              });
+            } else if (intervalsClone[0].low.isQuantity) {
+              perWidth = doSubtraction(successor(intervalsClone[0].low), intervalsClone[0].low);
+            } else {
+              perWidth = successor(intervalsClone[0].low) - intervalsClone[0].low;
+            }
+          } else if (intervalsClone[0].high != null) {
+            if (intervalsClone[0].high.isDateTime) {
+              precisionUnits = intervalsClone[0].high.getPrecision();
+              perWidth = new Quantity({
+                value: 1,
+                unit: precisionUnits
+              });
+            } else if (intervalsClone[0].high.isQuantity) {
+              perWidth = doSubtraction(successor(intervalsClone[0].high), intervalsClone[0].high);
+            } else {
+              perWidth = successor(intervalsClone[0].high) - intervalsClone[0].high;
+            }
+          } else {
+            throw new Error("Point type of intervals provided to collapse cannot be determined.");
+          }
+          if (typeof perWidth === 'number') {
+            perWidth = new Quantity({
+              value: perWidth,
+              unit: '1'
+            });
           }
         }
-        intervals.sort(function(a, b) {
-          if (typeof a.low.before === 'function') {
-            if (a.low.before(b.low)) {
+        intervalsClone.sort(function(a, b) {
+          var ref4, ref5;
+          if (typeof ((ref4 = a.low) != null ? ref4.before : void 0) === 'function') {
+            if ((b.low != null) && a.low.before(b.low)) {
               return -1;
             }
-            if (a.low.after(b.low)) {
+            if ((b.low == null) || a.low.after(b.low)) {
               return 1;
             }
-          } else {
+          } else if ((a.low != null) && (b.low != null)) {
             if (a.low < b.low) {
               return -1;
             }
             if (a.low > b.low) {
               return 1;
             }
+          } else if ((a.low != null) && (b.low == null)) {
+            return 1;
+          } else if ((a.low == null) && (b.low != null)) {
+            return -1;
+          }
+          if (typeof ((ref5 = a.high) != null ? ref5.before : void 0) === 'function') {
+            if ((b.high == null) || a.high.before(b.high)) {
+              return -1;
+            }
+            if (a.high.after(b.high)) {
+              return 1;
+            }
+          } else if ((a.high != null) && (b.high != null)) {
+            if (a.high < b.high) {
+              return -1;
+            }
+            if (a.high > b.high) {
+              return 1;
+            }
+          } else if ((a.high != null) && (b.high == null)) {
+            return -1;
+          } else if ((a.high == null) && (b.high != null)) {
+            return 1;
           }
           return 0;
         });
         collapsedIntervals = [];
-        a = intervals.shift();
-        b = intervals.shift();
-        if (typeof a.copy === 'function') {
-          a = a.copy();
-        }
-        if (typeof b.copy === 'function') {
-          b = b.copy();
-        }
+        a = intervalsClone.shift();
+        b = intervalsClone.shift();
         while (b) {
-          if (typeof b.low.sameOrBefore === 'function') {
-            if (b.low.sameOrBefore(a.high)) {
-              if (b.high.after(a.high)) {
+          if (typeof ((ref4 = b.low) != null ? ref4.durationBetween : void 0) === 'function') {
+            if ((ref5 = a.high) != null ? ref5.sameOrAfter(b.low) : void 0) {
+              if ((b.high == null) || b.high.after(a.high)) {
+                a.high = b.high;
+              }
+            } else if (((ref6 = a.high) != null ? ref6.durationBetween(b.low, perWidth.unit).high : void 0) <= perWidth.value) {
+              a.high = b.high;
+            } else {
+              collapsedIntervals.push(a);
+              a = b;
+            }
+          } else if (typeof ((ref7 = b.low) != null ? ref7.sameOrBefore : void 0) === 'function') {
+            if ((a.high != null) && b.low.sameOrBefore(doAddition(a.high, perWidth))) {
+              if ((b.high == null) || b.high.after(a.high)) {
                 a.high = b.high;
               }
             } else {
@@ -4329,8 +5044,8 @@
               a = b;
             }
           } else {
-            if (b.low <= a.high) {
-              if (b.high > a.high) {
+            if ((b.low - a.high) <= perWidth.value) {
+              if (b.high > a.high || (b.high == null)) {
                 a.high = b.high;
               }
             } else {
@@ -4338,7 +5053,7 @@
               a = b;
             }
           }
-          b = intervals.shift();
+          b = intervalsClone.shift();
         }
         collapsedIntervals.push(a);
         return collapsedIntervals;
@@ -4353,7 +5068,7 @@
 
 
 
-},{"../datatypes/interval":9,"../datatypes/logic":10,"../util/comparison":133,"./builder":14,"./expression":20}],25:[function(require,module,exports){
+},{"../datatypes/interval":9,"../datatypes/logic":10,"../util/comparison":134,"../util/math":135,"./builder":14,"./expression":20,"./quantity":32}],25:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var CodeDef, CodeSystemDef, ConceptDef, ExpressionDef, FunctionDef, Library, ParameterDef, Results, ValueSetDef, ref;
@@ -4455,10 +5170,10 @@
 
 
 
-},{"../runtime/results":132,"./expressions":21}],26:[function(require,module,exports){
+},{"../runtime/results":133,"./expressions":21}],26:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Current, Distinct, Exists, Expression, Filter, First, Flatten, ForEach, IndexOf, Last, List, SingletonFrom, Times, ToList, UnimplementedExpression, ValueSet, build, doContains, doDistinct, doIncludes, equals, equivalent, ref, ref1, typeIsArray,
+  var Current, Distinct, Exists, Expression, Filter, First, Flatten, ForEach, IndexOf, Last, List, SingletonFrom, Times, ToList, UnimplementedExpression, ValueSet, build, doContains, doDistinct, doIncludes, equals, ref, typeIsArray,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -4470,15 +5185,15 @@
 
   typeIsArray = require('../util/util').typeIsArray;
 
-  ref1 = require('../util/comparison'), equals = ref1.equals, equivalent = ref1.equivalent;
+  equals = require('../util/comparison').equals;
 
   module.exports.List = List = (function(superClass) {
     extend(List, superClass);
 
     function List(json) {
-      var ref2;
+      var ref1;
       List.__super__.constructor.apply(this, arguments);
-      this.elements = (ref2 = build(json.element)) != null ? ref2 : [];
+      this.elements = (ref1 = build(json.element)) != null ? ref1 : [];
     }
 
     Object.defineProperties(List.prototype, {
@@ -4490,11 +5205,11 @@
     });
 
     List.prototype.exec = function(ctx) {
-      var item, j, len, ref2, results;
-      ref2 = this.elements;
+      var item, j, len, ref1, results;
+      ref1 = this.elements;
       results = [];
-      for (j = 0, len = ref2.length; j < len; j++) {
-        item = ref2[j];
+      for (j = 0, len = ref1.length; j < len; j++) {
+        item = ref1[j];
         results.push(item.execute(ctx));
       }
       return results;
@@ -4512,8 +5227,17 @@
     }
 
     Exists.prototype.exec = function(ctx) {
-      var ref2;
-      return ((ref2 = this.execArgs(ctx)) != null ? ref2.length : void 0) > 0;
+      var item, j, len, list;
+      list = this.execArgs(ctx);
+      if ((list != null ? list.length : void 0) > 0) {
+        for (j = 0, len = list.length; j < len; j++) {
+          item = list[j];
+          if (item !== null) {
+            return true;
+          }
+        }
+      }
+      return false;
     };
 
     return Exists;
@@ -4525,10 +5249,11 @@
   };
 
   module.exports.doExcept = function(a, b) {
-    var itm, j, len, results;
+    var itm, j, len, results, setList;
+    setList = doDistinct(a);
     results = [];
-    for (j = 0, len = a.length; j < len; j++) {
-      itm = a[j];
+    for (j = 0, len = setList.length; j < len; j++) {
+      itm = setList[j];
       if (!doContains(b, itm)) {
         results.push(itm);
       }
@@ -4537,10 +5262,11 @@
   };
 
   module.exports.doIntersect = function(a, b) {
-    var itm, j, len, results;
+    var itm, j, len, results, setList;
+    setList = doDistinct(a);
     results = [];
-    for (j = 0, len = a.length; j < len; j++) {
-      itm = a[j];
+    for (j = 0, len = setList.length; j < len; j++) {
+      itm = setList[j];
       if (doContains(b, itm)) {
         results.push(itm);
       }
@@ -4632,7 +5358,7 @@
       }
       for (i = j = 0, len = src.length; j < len; i = ++j) {
         itm = src[i];
-        if (equivalent(itm, el)) {
+        if (equals(itm, el)) {
           index = i;
           break;
         }
@@ -4652,7 +5378,7 @@
     var element, j, len;
     for (j = 0, len = container.length; j < len; j++) {
       element = container[j];
-      if (equivalent(element, item)) {
+      if (equals(element, item)) {
         return true;
       }
     }
@@ -4713,7 +5439,12 @@
     }
 
     Distinct.prototype.exec = function(ctx) {
-      return doDistinct(this.execArgs(ctx));
+      var result;
+      result = this.execArgs(ctx);
+      if (result == null) {
+        return null;
+      }
+      return doDistinct(result);
     };
 
     return Distinct;
@@ -4721,18 +5452,31 @@
   })(Expression);
 
   doDistinct = function(list) {
-    var seen;
+    var firstNullFound, item, j, len, seen, setList;
     seen = [];
-    return list.filter(function(item) {
+    list.filter(function(item) {
       var isNew;
       isNew = seen.every(function(seenItem) {
-        return !equivalent(item, seenItem);
+        return !equals(item, seenItem);
       });
       if (isNew) {
         seen.push(item);
       }
       return isNew;
     });
+    firstNullFound = false;
+    setList = [];
+    for (j = 0, len = seen.length; j < len; j++) {
+      item = seen[j];
+      if (item !== null) {
+        setList.push(item);
+      }
+      if (item === null && !firstNullFound) {
+        setList.push(item);
+        firstNullFound = true;
+      }
+    }
+    return setList;
   };
 
   module.exports.Current = Current = (function(superClass) {
@@ -4794,7 +5538,7 @@
 
 
 
-},{"../datatypes/datatypes":6,"../util/comparison":133,"../util/util":135,"./builder":14,"./expression":20}],27:[function(require,module,exports){
+},{"../datatypes/datatypes":6,"../util/comparison":134,"../util/util":136,"./builder":14,"./expression":20}],27:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var BooleanLiteral, DecimalLiteral, Expression, IntegerLiteral, Literal, StringLiteral,
@@ -5118,14 +5862,12 @@
 },{"./expression":20}],30:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var After, Contains, DT, DateTime, Equal, Equivalent, Except, Exception, Expression, IVL, In, IncludedIn, Includes, IncompatibleTypesException, Indexer, Intersect, LIST, Length, NotEqual, ProperIncludedIn, ProperIncludes, STRING, ThreeValuedLogic, Union, build, equals, equivalent, ref, typeIsArray,
+  var After, Contains, DT, DateTime, Equal, Equivalent, Except, Exception, Expression, IVL, In, IncludedIn, Includes, Indexer, Intersect, LIST, Length, NotEqual, ProperIncludedIn, ProperIncludes, STRING, ThreeValuedLogic, Union, build, equals, equivalent, ref, typeIsArray,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
   Expression = require('./expression').Expression;
 
-  IncompatibleTypesException = require('./quantity').IncompatibleTypesException;
-
   ThreeValuedLogic = require('../datatypes/logic').ThreeValuedLogic;
 
   DateTime = require('../datatypes/datetime').DateTime;
@@ -5328,7 +6070,7 @@
     In.prototype.exec = function(ctx) {
       var container, item, lib, ref1;
       ref1 = this.execArgs(ctx), item = ref1[0], container = ref1[1];
-      if (container == null) {
+      if ((container == null) || (item == null)) {
         return null;
       }
       lib = (function() {
@@ -5358,7 +6100,7 @@
     Contains.prototype.exec = function(ctx) {
       var container, item, lib, ref1;
       ref1 = this.execArgs(ctx), container = ref1[0], item = ref1[1];
-      if (container == null) {
+      if ((container == null) || (item == null)) {
         return null;
       }
       lib = (function() {
@@ -5581,7 +6323,7 @@
 
 
 
-},{"../datatypes/datetime":7,"../datatypes/exception":8,"../datatypes/logic":10,"../util/comparison":133,"../util/util":135,"./builder":14,"./datetime":18,"./expression":20,"./interval":24,"./list":26,"./quantity":32,"./string":35}],31:[function(require,module,exports){
+},{"../datatypes/datetime":7,"../datatypes/exception":8,"../datatypes/logic":10,"../util/comparison":134,"../util/util":136,"./builder":14,"./datetime":18,"./expression":20,"./interval":24,"./list":26,"./string":36}],31:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Expression, ParameterDef, ParameterRef, build,
@@ -5643,7 +6385,7 @@
 },{"./builder":14,"./expression":20}],32:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Code, Exception, Expression, FunctionRef, IncompatibleTypesException, Quantity, ValueSet, build, clean_unit, convert_value, createQuantity, decimalAdjust, isValidDecimal, is_valid_ucum_unit, ref, ref1, ucum, ucum_multiply, ucum_time_units, ucum_to_cql_units, ucum_unit, unitValidityCache, units_to_string,
+  var Code, Exception, Expression, FunctionRef, Quantity, ValueSet, build, clean_unit, coalesceToOne, convert_value, createQuantity, decimalAdjust, doScaledAddition, isValidDecimal, is_valid_ucum_unit, ref, ref1, ucum, ucum_multiply, ucum_time_units, ucum_to_cql_units, ucum_unit, unitValidityCache, units_to_string,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -5661,19 +6403,6 @@
 
   ucum = require('ucum');
 
-  module.exports.IncompatibleTypesException = IncompatibleTypesException = IncompatibleTypesException = (function(superClass) {
-    extend(IncompatibleTypesException, superClass);
-
-    function IncompatibleTypesException(a1, b1, e) {
-      this.a = a1;
-      this.b = b1;
-      IncompatibleTypesException.__super__.constructor.call(this, "Incompatible Types '" + this.a + "' and '" + this.b + "'", e);
-    }
-
-    return IncompatibleTypesException;
-
-  })(Exception);
-
   module.exports.Quantity = Quantity = (function(superClass) {
     extend(Quantity, superClass);
 
@@ -5681,10 +6410,12 @@
       Quantity.__super__.constructor.apply(this, arguments);
       this.unit = json.unit;
       if (json.value == null) {
-        this.value = null;
+        throw new Error("Cannot create a quantity with an undefined value");
       } else {
         this.value = parseFloat(json.value);
-        isValidDecimal(this.value);
+        if (!isValidDecimal(this.value)) {
+          throw new Error("Cannot create a quantity with an invalid decimal value");
+        }
       }
       if ((this.unit != null) && !is_valid_ucum_unit(this.unit)) {
         throw new Error("\'" + this.unit + "\' is not a valid UCUM unit.");
@@ -5718,7 +6449,11 @@
       var other_v;
       if (other instanceof Quantity) {
         other_v = convert_value(other.value, ucum_unit(other.unit), ucum_unit(this.unit));
-        return this.value <= other_v;
+        if (other_v == null) {
+          return null;
+        } else {
+          return this.value <= other_v;
+        }
       }
     };
 
@@ -5726,7 +6461,11 @@
       var other_v;
       if (other instanceof Quantity) {
         other_v = convert_value(other.value, ucum_unit(other.unit), ucum_unit(this.unit));
-        return this.value >= other_v;
+        if (other_v == null) {
+          return null;
+        } else {
+          return this.value >= other_v;
+        }
       }
     };
 
@@ -5734,7 +6473,11 @@
       var other_v;
       if (other instanceof Quantity) {
         other_v = convert_value(other.value, ucum_unit(other.unit), ucum_unit(this.unit));
-        return this.value > other_v;
+        if (other_v == null) {
+          return null;
+        } else {
+          return this.value > other_v;
+        }
       }
     };
 
@@ -5742,7 +6485,11 @@
       var other_v;
       if (other instanceof Quantity) {
         other_v = convert_value(other.value, ucum_unit(other.unit), ucum_unit(this.unit));
-        return this.value < other_v;
+        if (other_v == null) {
+          return null;
+        } else {
+          return this.value < other_v;
+        }
       }
     };
 
@@ -5755,7 +6502,11 @@
           return this.value === other.value;
         } else {
           other_v = convert_value(other.value, ucum_unit(other.unit), ucum_unit(this.unit));
-          return decimalAdjust("round", this.value, -8) === decimalAdjust("round", other_v, -8);
+          if (other_v == null) {
+            return null;
+          } else {
+            return decimalAdjust("round", this.value, -8) === decimalAdjust("round", other_v, -8);
+          }
         }
       }
     };
@@ -5773,21 +6524,31 @@
     };
 
     Quantity.prototype.multiplyDivide = function(other, operator) {
-      var can_val, other_can_value, ucum_value, unit, value;
+      var a, b, can_val, other_can_value, ucum_value, value;
       if (other instanceof Quantity) {
-        if (this.unit && other.unit) {
-          can_val = this.to_ucum();
-          other_can_value = other.to_ucum();
-          ucum_value = ucum_multiply(can_val, [[operator, other_can_value]]);
+        a = this.unit != null ? this : new Quantity({
+          value: this.value,
+          unit: "1"
+        });
+        b = other.unit != null ? other : new Quantity({
+          value: other.value,
+          unit: "1"
+        });
+        can_val = a.to_ucum();
+        other_can_value = b.to_ucum();
+        ucum_value = ucum_multiply(can_val, [[operator, other_can_value]]);
+        try {
           return createQuantity(ucum_value.value, units_to_string(ucum_value.units));
-        } else {
-          value = operator === "/" ? this.value / other.value : this.value * other.value;
-          unit = this.unit || other.unit;
-          return createQuantity(decimalAdjust("round", value, -8), unit);
+        } catch (error) {
+          return null;
         }
       } else {
         value = operator === "/" ? this.value / other : this.value * other;
-        return createQuantity(decimalAdjust("round", value, -8), this.unit);
+        try {
+          return createQuantity(decimalAdjust("round", value, -8), coalesceToOne(this.unit));
+        } catch (error) {
+          return null;
+        }
       }
     };
 
@@ -5880,7 +6641,7 @@
       }
     } catch (error) {
       e = error;
-      throw new IncompatibleTypesException(from, to, e);
+      return null;
     }
   };
 
@@ -5928,7 +6689,7 @@
       unit_string += "/" + denom.join("/");
     }
     if (unit_string === "") {
-      return null;
+      return "1";
     } else {
       return unit_string;
     }
@@ -5986,34 +6747,36 @@
         unit: unit
       });
     } else {
-      throw new Error("Unable to parse Quantity");
+      return null;
     }
   };
 
-  module.exports.doAddition = function(a, b) {
-    var base, val;
+  doScaledAddition = function(a, b, scaleForB) {
+    var a_unit, b_unit, ref2, val;
     if (a instanceof Quantity && b instanceof Quantity) {
-      val = convert_value(b.value, b.unit, a.unit);
+      ref2 = [coalesceToOne(a.unit), coalesceToOne(b.unit)], a_unit = ref2[0], b_unit = ref2[1];
+      val = convert_value(b.value * scaleForB, b_unit, a_unit);
+      if (val == null) {
+        return null;
+      }
       return new Quantity({
-        unit: a.unit,
+        unit: a_unit,
         value: a.value + val
       });
+    } else if (a.copy && a.add) {
+      b_unit = b instanceof Quantity ? coalesceToOne(b.unit) : b.unit;
+      return a.copy().add(b.value * scaleForB, clean_unit(b_unit));
     } else {
-      return typeof a.copy === "function" ? typeof (base = a.copy()).add === "function" ? base.add(b.value, clean_unit(b.unit)) : void 0 : void 0;
+      throw new Error("Unsupported argument types.");
     }
   };
 
+  module.exports.doAddition = function(a, b) {
+    return doScaledAddition(a, b, 1);
+  };
+
   module.exports.doSubtraction = function(a, b) {
-    var base, val;
-    if (a instanceof Quantity && b instanceof Quantity) {
-      val = convert_value(b.value, b.unit, a.unit);
-      return new Quantity({
-        unit: a.unit,
-        value: a.value - val
-      });
-    } else {
-      return typeof a.copy === "function" ? typeof (base = a.copy()).add === "function" ? base.add(b.value * -1, clean_unit(b.unit)) : void 0 : void 0;
-    }
+    return doScaledAddition(a, b, -1);
   };
 
   module.exports.doDivision = function(a, b) {
@@ -6030,11 +6793,19 @@
     }
   };
 
+  coalesceToOne = function(o) {
+    if ((o == null) || ((o.trim != null) && !o.trim())) {
+      return '1';
+    } else {
+      return o;
+    }
+  };
+
 }).call(this);
 
 
 
-},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../util/math":134,"./builder":14,"./expression":20,"./reusable":34,"ucum":145}],33:[function(require,module,exports){
+},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../util/math":135,"./builder":14,"./expression":20,"./reusable":35,"ucum":146}],33:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var AliasRef, AliasedQuerySource, ByColumn, ByDirection, ByExpression, Context, Expression, LetClause, MultiSource, Query, QueryLetRef, ReturnClause, Sort, SortClause, UnimplementedExpression, With, Without, allTrue, build, equals, ref, ref1, toDistinctList, typeIsArray,
@@ -6427,7 +7198,95 @@
 
 
 
-},{"../runtime/context":129,"../util/comparison":133,"../util/util":135,"./builder":14,"./expression":20}],34:[function(require,module,exports){
+},{"../runtime/context":130,"../util/comparison":134,"../util/util":136,"./builder":14,"./expression":20}],34:[function(require,module,exports){
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var Exception, Expression, Quantity, Ratio, createRatio,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  Exception = require('../datatypes/exception').Exception;
+
+  Expression = require('./expression').Expression;
+
+  Quantity = require('./quantity').Quantity;
+
+  module.exports.Ratio = Ratio = (function(superClass) {
+    extend(Ratio, superClass);
+
+    function Ratio(json) {
+      Ratio.__super__.constructor.apply(this, arguments);
+      if (json.numerator == null) {
+        throw new Error("Cannot create a ratio with an undefined numerator value");
+      } else {
+        this.numerator = new Quantity(json.numerator);
+      }
+      if (json.denominator == null) {
+        throw new Error("Cannot create a ratio with an undefined denominator value");
+      } else {
+        this.denominator = new Quantity(json.denominator);
+      }
+    }
+
+    Object.defineProperties(Ratio.prototype, {
+      isRatio: {
+        get: function() {
+          return true;
+        }
+      }
+    });
+
+    Ratio.prototype.clone = function() {
+      return new Ratio({
+        numerator: this.numerator.clone(),
+        denominator: this.denominator.clone()
+      });
+    };
+
+    Ratio.prototype.exec = function(ctx) {
+      return this;
+    };
+
+    Ratio.prototype.toString = function() {
+      return (this.numerator.toString()) + " : " + (this.denominator.toString());
+    };
+
+    Ratio.prototype.equals = function(other) {
+      var divided_other, divided_this;
+      if (other instanceof Ratio) {
+        divided_this = this.numerator.dividedBy(this.denominator);
+        divided_other = other.numerator.dividedBy(other.denominator);
+        return divided_this.equals(divided_other);
+      } else {
+        return false;
+      }
+    };
+
+    Ratio.prototype.equivalent = function(other) {
+      var equal;
+      equal = this.equals(other);
+      if (equal == null) {
+        return false;
+      }
+      return equal;
+    };
+
+    return Ratio;
+
+  })(Expression);
+
+  module.exports.createRatio = createRatio = function(numerator, denominator) {
+    return new Ratio({
+      numerator: numerator,
+      denominator: denominator
+    });
+  };
+
+}).call(this);
+
+
+
+},{"../datatypes/exception":8,"./expression":20,"./quantity":32}],35:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Expression, ExpressionDef, ExpressionRef, FunctionDef, FunctionRef, IdentifierRef, OperandRef, build,
@@ -6586,7 +7445,7 @@
 
 
 
-},{"./builder":14,"./expression":20}],35:[function(require,module,exports){
+},{"./builder":14,"./expression":20}],36:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Combine, Concatenate, EndsWith, Expression, Lower, PositionOf, Split, StartsWith, Substring, Upper, build,
@@ -6816,7 +7675,7 @@
 
 
 
-},{"./builder":14,"./expression":20}],36:[function(require,module,exports){
+},{"./builder":14,"./expression":20}],37:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Expression, Property, Tuple, TupleElement, TupleElementDefinition, UnimplementedExpression, build, ref,
@@ -6936,10 +7795,10 @@
 
 
 
-},{"./builder":14,"./expression":20}],37:[function(require,module,exports){
+},{"./builder":14,"./expression":20}],38:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var As, Concept, Convert, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, parseQuantity, ref, ref1,
+  var As, Concept, Convert, Date, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDate, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, normalizeMillisecondsField, parseQuantity, ref, ref1, ref2,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -6947,23 +7806,25 @@
 
   FunctionRef = require('./reusable').FunctionRef;
 
-  DateTime = require('../datatypes/datetime').DateTime;
+  ref1 = require('../datatypes/datetime'), DateTime = ref1.DateTime, Date = ref1.Date;
 
   Concept = require('../datatypes/clinical').Concept;
 
   parseQuantity = require('./quantity').parseQuantity;
 
-  ref1 = require('../util/math'), isValidDecimal = ref1.isValidDecimal, isValidInteger = ref1.isValidInteger, limitDecimalPrecision = ref1.limitDecimalPrecision;
+  ref2 = require('../util/math'), isValidDecimal = ref2.isValidDecimal, isValidInteger = ref2.isValidInteger, limitDecimalPrecision = ref2.limitDecimalPrecision;
+
+  normalizeMillisecondsField = require('../util/util').normalizeMillisecondsField;
 
   module.exports.As = As = (function(superClass) {
     extend(As, superClass);
 
     function As(json) {
-      var ref2;
+      var ref3;
       As.__super__.constructor.apply(this, arguments);
       this.asType = json.asType;
       this.asTypeSpecifier = json.asTypeSpecifier;
-      this.strict = (ref2 = json.strict) != null ? ref2 : false;
+      this.strict = (ref3 = json.strict) != null ? ref3 : false;
     }
 
     As.prototype.exec = function(ctx) {
@@ -6985,7 +7846,7 @@
       var arg, strArg;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        strArg = arg.toString();
+        strArg = arg.toString().toLowerCase();
         if (strArg === "true" || strArg === "t" || strArg === "yes" || strArg === "y" || strArg === "1") {
           return true;
         } else if (strArg === "false" || strArg === "f" || strArg === "no" || strArg === "n" || strArg === "0") {
@@ -7023,6 +7884,29 @@
 
   })(Expression);
 
+  module.exports.ToDate = ToDate = (function(superClass) {
+    extend(ToDate, superClass);
+
+    function ToDate(json) {
+      ToDate.__super__.constructor.apply(this, arguments);
+    }
+
+    ToDate.prototype.exec = function(ctx) {
+      var arg;
+      arg = this.execArgs(ctx);
+      if (arg == null) {
+        return null;
+      } else if (arg.isDateTime) {
+        return arg.getDate();
+      } else {
+        return Date.parse(arg.toString());
+      }
+    };
+
+    return ToDate;
+
+  })(Expression);
+
   module.exports.ToDateTime = ToDateTime = (function(superClass) {
     extend(ToDateTime, superClass);
 
@@ -7033,10 +7917,12 @@
     ToDateTime.prototype.exec = function(ctx) {
       var arg;
       arg = this.execArgs(ctx);
-      if ((arg != null) && typeof arg !== 'undefined') {
-        return DateTime.parse(arg.toString());
-      } else {
+      if (arg == null) {
         return null;
+      } else if (arg.isDate) {
+        return arg.getDateTime();
+      } else {
+        return DateTime.parse(arg.toString());
       }
     };
 
@@ -7060,9 +7946,8 @@
         if (isValidDecimal(decimal)) {
           return decimal;
         }
-      } else {
-        return null;
       }
+      return null;
     };
 
     return ToDecimal;
@@ -7084,9 +7969,8 @@
         if (isValidInteger(integer)) {
           return integer;
         }
-      } else {
-        return null;
       }
+      return null;
     };
 
     return ToInteger;
@@ -7144,15 +8028,46 @@
     }
 
     ToTime.prototype.exec = function(ctx) {
-      var arg, dt;
+      var arg, hours, matches, milliseconds, minutes, seconds, timeString, timezoneOffset, tz;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        dt = DateTime.parse(arg.toString());
-        if ((dt != null) && typeof dt !== 'undefined') {
-          return dt.getTime();
-        } else {
+        timeString = arg.toString();
+        matches = /T((\d{2})(\:(\d{2})(\:(\d{2})(\.(\d+))?)?)?)?(Z|(([+-])(\d{2})(\:?(\d{2}))?))?/.exec(timeString);
+        if (matches == null) {
           return null;
         }
+        hours = matches[2];
+        minutes = matches[4];
+        seconds = matches[6];
+        if (hours != null) {
+          if (!(hours >= 0 && hours <= 23)) {
+            return null;
+          }
+          hours = parseInt(hours, 10);
+        }
+        if (minutes != null) {
+          if (!(minutes >= 0 && minutes <= 59)) {
+            return null;
+          }
+          minutes = parseInt(minutes, 10);
+        }
+        if (seconds != null) {
+          if (!(seconds >= 0 && seconds <= 59)) {
+            return null;
+          }
+          seconds = parseInt(seconds, 10);
+        }
+        milliseconds = matches[8];
+        if (milliseconds != null) {
+          milliseconds = parseInt(normalizeMillisecondsField(milliseconds));
+        }
+        if (matches[11] != null) {
+          tz = parseInt(matches[12], 10) + (matches[14] != null ? parseInt(matches[14], 10) / 60 : 0);
+          timezoneOffset = matches[11] === '+' ? tz : tz * -1;
+        } else if (matches[9] === 'Z') {
+          timezoneOffset = 0;
+        }
+        return new DateTime(0, 1, 1, hours, minutes, seconds, milliseconds, timezoneOffset);
       } else {
         return null;
       }
@@ -7208,6 +8123,11 @@
             "type": "ToDateTime",
             "operand": this.operand
           }).execute(ctx);
+        case "{urn:hl7-org:elm-types:r1}Date":
+          return new ToDate({
+            "type": "ToDate",
+            "operand": this.operand
+          }).execute(ctx);
         case "{urn:hl7-org:elm-types:r1}Time":
           return new ToTime({
             "type": "ToTime",
@@ -7281,7 +8201,7 @@
 
 
 
-},{"../datatypes/clinical":5,"../datatypes/datetime":7,"../util/math":134,"./expression":20,"./quantity":32,"./reusable":34}],38:[function(require,module,exports){
+},{"../datatypes/clinical":5,"../datatypes/datetime":7,"../util/math":135,"../util/util":136,"./expression":20,"./quantity":32,"./reusable":35}],39:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   window.cql = require('../../cql');
@@ -7310,7 +8230,7 @@
 
 
 
-},{"../../cql":4}],39:[function(require,module,exports){
+},{"../../cql":4}],40:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Alert, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -7469,7 +8389,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],40:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],41:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, AllergyIntolerance, AllergyIntoleranceEventComponent, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -7827,7 +8747,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],41:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],42:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Appointment, AppointmentParticipantComponent, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -8174,7 +9094,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],42:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],43:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, AppointmentResponse, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -8395,7 +9315,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],43:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],44:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, Availability, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -8563,7 +9483,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],44:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],45:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, Basic, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -8714,7 +9634,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],45:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],46:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, Binary, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -8818,7 +9738,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],46:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],47:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, Bundle, BundleEntryComponent, BundleEntryDeletedComponent, BundleLinkComponent, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -9166,7 +10086,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],47:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],48:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CarePlan, CarePlanActivityComponent, CarePlanActivitySimpleComponent, CarePlanGoalComponent, CarePlanParticipantComponent, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -9766,7 +10686,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],48:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],49:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var AddedItemAdjudicationComponent, AddedItemComponent, AddedItemDetailAdjudicationComponent, AddedItemsDetailComponent, Address, Attachment, BackboneElement, CORE, ClaimResponse, CodeableConcept, Coding, ContactPoint, DT, DetailAdjudicationComponent, DomainResource, Element, ElementDefinition, ErrorsComponent, Extension, HumanName, Identifier, ItemAdjudicationComponent, ItemDetailComponent, ItemSubdetailComponent, ItemsComponent, Narrative, NotesComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, SubdetailAdjudicationComponent, Timing,
@@ -10913,7 +11833,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],49:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],50:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, CommunicationRequest, CommunicationRequestMessagePartComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -11261,7 +12181,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],50:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],51:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, Composition, CompositionAttesterComponent, CompositionEventComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, SectionComponent, Timing,
@@ -11731,7 +12651,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],51:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],52:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ConceptMap, ConceptMapElementComponent, ConceptMapElementMapComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, OtherElementComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -12193,7 +13113,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],52:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],53:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, Condition, ConditionDueToComponent, ConditionEvidenceComponent, ConditionLocationComponent, ConditionOccurredFollowingComponent, ConditionStageComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -12769,7 +13689,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],53:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],54:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, Conformance, ConformanceDocumentComponent, ConformanceImplementationComponent, ConformanceMessagingComponent, ConformanceMessagingEventComponent, ConformanceRestComponent, ConformanceRestOperationComponent, ConformanceRestResourceComponent, ConformanceRestResourceSearchParamComponent, ConformanceRestSecurityCertificateComponent, ConformanceRestSecurityComponent, ConformanceSoftwareComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, ResourceInteractionComponent, SampledData, SystemInteractionComponent, Timing,
@@ -13958,7 +14878,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],54:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],55:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, Contract, ContractSignerComponent, ContractTermComponent, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -14497,7 +15417,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],55:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],56:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, Contraindication, ContraindicationMitigationComponent, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -14764,7 +15684,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],56:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],57:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, Base, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, ElementDefinitionBindingComponent, ElementDefinitionConstraintComponent, ElementDefinitionMappingComponent, ElementDefinitionSlicingComponent, Extension, HumanName, Identifier, Narrative, Parameters, ParametersParameterComponent, Period, Quantity, Range, Ratio, Reference, Resource, ResourceMetaComponent, SampledData, Timing, TimingRepeatComponent, TypeRefComponent,
@@ -16951,7 +17871,7 @@
 
 
 
-},{"../cql-datatypes":2}],57:[function(require,module,exports){
+},{"../cql-datatypes":2}],58:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, Coverage, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -17183,7 +18103,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],58:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],59:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DataElement, DataElementBindingComponent, DataElementMappingComponent, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -17641,7 +18561,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],59:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],60:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, Device, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -17883,7 +18803,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],60:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],61:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DeviceComponent, DeviceComponentProductionSpecificationComponent, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -18152,7 +19072,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],61:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],62:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DeviceUseRequest, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -18448,7 +19368,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],62:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],63:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DeviceUseStatement, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -18683,7 +19603,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],63:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],64:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DiagnosticOrder, DiagnosticOrderEventComponent, DiagnosticOrderItemComponent, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -19084,7 +20004,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],64:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],65:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DiagnosticReport, DiagnosticReportImageComponent, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -19458,7 +20378,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],65:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],66:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DocumentManifest, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -19727,7 +20647,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],66:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],67:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DocumentReference, DocumentReferenceContextComponent, DocumentReferenceRelatesToComponent, DocumentReferenceServiceComponent, DocumentReferenceServiceParameterComponent, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -20311,7 +21231,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],67:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],68:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Eligibility, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -20486,7 +21406,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],68:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],69:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, EligibilityResponse, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -20693,7 +21613,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],69:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],70:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Encounter, EncounterHospitalizationAccomodationComponent, EncounterHospitalizationComponent, EncounterLocationComponent, EncounterParticipantComponent, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -21311,7 +22231,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],70:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],71:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Enrollment, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -21522,7 +22442,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],71:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],72:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, EnrollmentResponse, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -21729,7 +22649,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],72:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],73:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, ExplanationOfBenefit, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -21936,7 +22856,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],73:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],74:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, ExtensionDefinition, ExtensionDefinitionMappingComponent, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -22286,7 +23206,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],74:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],75:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, FamilyHistory, FamilyHistoryRelationComponent, FamilyHistoryRelationConditionComponent, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -22699,7 +23619,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],75:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],76:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, Group, GroupCharacteristicComponent, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -22972,7 +23892,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],76:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],77:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HealthcareService, HealthcareServiceAvailableTimeComponent, HealthcareServiceNotAvailableTimeComponent, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, ServiceTypeComponent, Timing,
@@ -23599,7 +24519,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],77:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],78:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, ImagingObjectSelection, InstanceComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, SeriesComponent, StudyComponent, Timing,
@@ -23977,7 +24897,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],78:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],79:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, ImagingStudy, ImagingStudySeriesComponent, ImagingStudySeriesInstanceComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -24508,7 +25428,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],79:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],80:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Immunization, ImmunizationExplanationComponent, ImmunizationReactionComponent, ImmunizationVaccinationProtocolComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -25040,7 +25960,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],80:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],81:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, ImmunizationRecommendation, ImmunizationRecommendationRecommendationComponent, ImmunizationRecommendationRecommendationDateCriterionComponent, ImmunizationRecommendationRecommendationProtocolComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -25412,7 +26332,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],81:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],82:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, List, ListEntryComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -25686,7 +26606,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],82:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],83:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Location, LocationPositionComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -25969,7 +26889,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],83:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],84:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Media, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -26204,7 +27124,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],84:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],85:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Medication, MedicationPackageComponent, MedicationPackageContentComponent, MedicationProductComponent, MedicationProductIngredientComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -26552,7 +27472,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],85:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],86:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, MedicationAdministration, MedicationAdministrationDosageComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -26957,7 +27877,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],86:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],87:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, MedicationDispense, MedicationDispenseDispenseComponent, MedicationDispenseDispenseDosageComponent, MedicationDispenseSubstitutionComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -27520,7 +28440,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],87:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],88:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, MedicationPrescription, MedicationPrescriptionDispenseComponent, MedicationPrescriptionDosageInstructionComponent, MedicationPrescriptionSubstitutionComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -28057,7 +28977,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],88:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],89:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, MedicationStatement, MedicationStatementDosageComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -28390,7 +29310,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],89:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],90:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, MessageDestinationComponent, MessageHeader, MessageHeaderResponseComponent, MessageSourceComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -28803,7 +29723,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],90:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],91:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   module.exports = require('./core');
@@ -28988,7 +29908,7 @@
 
 
 
-},{"./alert":39,"./allergyintolerance":40,"./appointment":41,"./appointmentresponse":42,"./availability":43,"./basic":44,"./binary":45,"./bundle":46,"./careplan":47,"./claimresponse":48,"./communicationrequest":49,"./composition":50,"./conceptmap":51,"./condition":52,"./conformance":53,"./contract":54,"./contraindication":55,"./core":56,"./coverage":57,"./dataelement":58,"./device":59,"./devicecomponent":60,"./deviceuserequest":61,"./deviceusestatement":62,"./diagnosticorder":63,"./diagnosticreport":64,"./documentmanifest":65,"./documentreference":66,"./eligibility":67,"./eligibilityresponse":68,"./encounter":69,"./enrollment":70,"./enrollmentresponse":71,"./explanationofbenefit":72,"./extensiondefinition":73,"./familyhistory":74,"./group":75,"./healthcareservice":76,"./imagingobjectselection":77,"./imagingstudy":78,"./immunization":79,"./immunizationrecommendation":80,"./list":81,"./location":82,"./media":83,"./medication":84,"./medicationadministration":85,"./medicationdispense":86,"./medicationprescription":87,"./medicationstatement":88,"./messageheader":89,"./namingsystem":91,"./nutritionorder":92,"./observation":93,"./operationdefinition":94,"./operationoutcome":95,"./oralhealthclaim":96,"./order":97,"./orderresponse":98,"./organization":99,"./other":100,"./patient":101,"./paymentnotice":102,"./paymentreconciliation":103,"./pendedrequest":104,"./practitioner":105,"./procedure":106,"./procedurerequest":107,"./profile":108,"./provenance":109,"./query":110,"./questionnaire":111,"./questionnaireanswers":112,"./readjudicate":113,"./referralrequest":114,"./relatedperson":115,"./reversal":116,"./riskassessment":117,"./searchparameter":118,"./securityevent":119,"./slot":120,"./specimen":121,"./statusrequest":122,"./statusresponse":123,"./subscription":124,"./substance":125,"./supply":126,"./supportingdocumentation":127,"./valueset":128}],91:[function(require,module,exports){
+},{"./alert":40,"./allergyintolerance":41,"./appointment":42,"./appointmentresponse":43,"./availability":44,"./basic":45,"./binary":46,"./bundle":47,"./careplan":48,"./claimresponse":49,"./communicationrequest":50,"./composition":51,"./conceptmap":52,"./condition":53,"./conformance":54,"./contract":55,"./contraindication":56,"./core":57,"./coverage":58,"./dataelement":59,"./device":60,"./devicecomponent":61,"./deviceuserequest":62,"./deviceusestatement":63,"./diagnosticorder":64,"./diagnosticreport":65,"./documentmanifest":66,"./documentreference":67,"./eligibility":68,"./eligibilityresponse":69,"./encounter":70,"./enrollment":71,"./enrollmentresponse":72,"./explanationofbenefit":73,"./extensiondefinition":74,"./familyhistory":75,"./group":76,"./healthcareservice":77,"./imagingobjectselection":78,"./imagingstudy":79,"./immunization":80,"./immunizationrecommendation":81,"./list":82,"./location":83,"./media":84,"./medication":85,"./medicationadministration":86,"./medicationdispense":87,"./medicationprescription":88,"./medicationstatement":89,"./messageheader":90,"./namingsystem":92,"./nutritionorder":93,"./observation":94,"./operationdefinition":95,"./operationoutcome":96,"./oralhealthclaim":97,"./order":98,"./orderresponse":99,"./organization":100,"./other":101,"./patient":102,"./paymentnotice":103,"./paymentreconciliation":104,"./pendedrequest":105,"./practitioner":106,"./procedure":107,"./procedurerequest":108,"./profile":109,"./provenance":110,"./query":111,"./questionnaire":112,"./questionnaireanswers":113,"./readjudicate":114,"./referralrequest":115,"./relatedperson":116,"./reversal":117,"./riskassessment":118,"./searchparameter":119,"./securityevent":120,"./slot":121,"./specimen":122,"./statusrequest":123,"./statusresponse":124,"./subscription":125,"./substance":126,"./supply":127,"./supportingdocumentation":128,"./valueset":129}],92:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, NamingSystem, NamingSystemContactComponent, NamingSystemUniqueIdComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -29308,7 +30228,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],92:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],93:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, NutritionOrder, NutritionOrderItemComponent, NutritionOrderItemEnteralFormulaComponent, NutritionOrderItemOralDietComponent, NutritionOrderItemOralDietNutrientsComponent, NutritionOrderItemOralDietTextureComponent, NutritionOrderItemSupplementComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -30014,7 +30934,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],93:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],94:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Observation, ObservationReferenceRangeComponent, ObservationRelatedComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -30551,7 +31471,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],94:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],95:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, OperationDefinition, OperationDefinitionParameterComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -30939,7 +31859,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],95:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],96:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, OperationOutcome, OperationOutcomeIssueComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -31103,7 +32023,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],96:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],97:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, CoverageComponent, DT, DetailComponent, DiagnosisComponent, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, ItemsComponent, MissingTeethComponent, Narrative, OralHealthClaim, OrthodonticPlanComponent, Parameters, PayeeComponent, Period, ProsthesisComponent, Quantity, Range, Ratio, Reference, Resource, SampledData, SubDetailComponent, Timing,
@@ -32479,7 +33399,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],97:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],98:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Order, OrderWhenComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -32740,7 +33660,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],98:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],99:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, OrderResponse, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -32942,7 +33862,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],99:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],100:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Organization, OrganizationContactComponent, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -33249,7 +34169,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],100:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],101:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Other, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -33400,7 +34320,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],101:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],102:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, AnimalComponent, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Patient, PatientLinkComponent, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -33976,7 +34896,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],102:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],103:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, PaymentNotice, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -34187,7 +35107,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],103:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],104:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DetailsComponent, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, NotesComponent, Parameters, PaymentReconciliation, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -34619,7 +35539,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],104:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],105:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, PendedRequest, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -34838,7 +35758,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],105:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],106:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Practitioner, PractitionerQualificationComponent, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -35225,7 +36145,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],106:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],107:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Procedure, ProcedurePerformerComponent, ProcedureRelatedItemComponent, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -35604,7 +36524,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],107:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],108:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, ProcedureRequest, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -35915,7 +36835,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],108:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],109:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ConstraintComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Profile, ProfileMappingComponent, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -36318,7 +37238,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],109:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],110:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Provenance, ProvenanceAgentComponent, ProvenanceEntityComponent, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -36663,7 +37583,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],110:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],111:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Query, QueryResponseComponent, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -36951,7 +37871,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],111:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],112:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, GroupComponent, HumanName, Identifier, Narrative, Parameters, Period, Quantity, QuestionComponent, Questionnaire, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -37353,7 +38273,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],112:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],113:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, GroupComponent, HumanName, Identifier, Narrative, Parameters, Period, Quantity, QuestionAnswerComponent, QuestionComponent, QuestionnaireAnswers, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -37874,7 +38794,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],113:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],114:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, ItemsComponent, Narrative, Parameters, Period, Quantity, Range, Ratio, Readjudicate, Reference, Resource, SampledData, Timing,
@@ -38131,7 +39051,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],114:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],115:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, ReferralRequest, Resource, SampledData, Timing,
@@ -38419,7 +39339,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],115:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],116:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, RelatedPerson, Resource, SampledData, Timing,
@@ -38618,7 +39538,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],116:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],117:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, PayeeComponent, Period, Quantity, Range, Ratio, Reference, Resource, Reversal, ReversalCoverageComponent, SampledData, Timing,
@@ -38991,7 +39911,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],117:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],118:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, RiskAssessment, RiskAssessmentPredictionComponent, SampledData, Timing,
@@ -39304,7 +40224,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],118:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],119:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, SearchParameter, Timing,
@@ -39497,7 +40417,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],119:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],120:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, SecurityEvent, SecurityEventEventComponent, SecurityEventObjectComponent, SecurityEventObjectDetailComponent, SecurityEventParticipantComponent, SecurityEventParticipantNetworkComponent, SecurityEventSourceComponent, Timing,
@@ -40119,7 +41039,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],120:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],121:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Slot, Timing,
@@ -40312,7 +41232,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],121:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],122:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Specimen, SpecimenCollectionComponent, SpecimenContainerComponent, SpecimenSourceComponent, SpecimenTreatmentComponent, Timing,
@@ -40849,7 +41769,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],122:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],123:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, StatusRequest, Timing,
@@ -41048,7 +41968,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],123:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],124:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, StatusResponse, StatusResponseNotesComponent, Timing,
@@ -41348,7 +42268,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],124:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],125:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Subscription, SubscriptionChannelComponent, SubscriptionTagComponent, Timing,
@@ -41642,7 +42562,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],125:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],126:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Substance, SubstanceIngredientComponent, SubstanceInstanceComponent, Timing,
@@ -41877,7 +42797,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],126:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],127:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Supply, SupplyDispenseComponent, Timing,
@@ -42182,7 +43102,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],127:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],128:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, SupportingDocumentation, SupportingDocumentationDetailComponent, Timing,
@@ -42489,7 +43409,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],128:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],129:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ConceptDefinitionComponent, ConceptDefinitionDesignationComponent, ConceptReferenceComponent, ConceptSetComponent, ConceptSetFilterComponent, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing, ValueSet, ValueSetComposeComponent, ValueSetDefineComponent, ValueSetExpansionComponent, ValueSetExpansionContainsComponent,
@@ -43379,7 +44299,7 @@
 
 
 
-},{"../cql-datatypes":2,"./core":56}],129:[function(require,module,exports){
+},{"../cql-datatypes":2,"./core":57}],130:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Context, Exception, Library, PatientContext, PopulationContext, dt, typeIsArray, util,
@@ -43650,7 +44570,7 @@
     Context.prototype.matchesTupleTypeSpecifier = function(val, spec) {
       return typeof val === "object" && !typeIsArray(val) && spec.element.every((function(_this) {
         return function(x) {
-          return typeof val[x.name] === "undefined" || _this.matchesTypeSpecifier(val[x.name], x.type);
+          return typeof val[x.name] === "undefined" || _this.matchesTypeSpecifier(val[x.name], x.elementType);
         };
       })(this));
     };
@@ -43673,6 +44593,8 @@
           return val != null ? val.isConcept : void 0;
         case "{urn:hl7-org:elm-types:r1}DateTime":
           return val != null ? val.isDateTime : void 0;
+        case "{urn:hl7-org:elm-types:r1}Date":
+          return val != null ? val.isDate : void 0;
         case "{urn:hl7-org:elm-types:r1}Quantity":
           return val != null ? val.isQuantity : void 0;
         case "{urn:hl7-org:elm-types:r1}Time":
@@ -43743,7 +44665,7 @@
     function PatientContext(library1, patient, codeService, parameters, executionDateTime) {
       this.library = library1;
       this.patient = patient;
-      this.executionDateTime = executionDateTime != null ? executionDateTime : dt.DateTime.fromDate(new Date());
+      this.executionDateTime = executionDateTime != null ? executionDateTime : dt.DateTime.fromJSDate(new Date());
       PatientContext.__super__.constructor.call(this, this.library, codeService, parameters);
     }
 
@@ -43776,7 +44698,7 @@
     function PopulationContext(library1, results, codeService, parameters, executionDateTime) {
       this.library = library1;
       this.results = results;
-      this.executionDateTime = executionDateTime != null ? executionDateTime : dt.DateTime.fromDate(new Date());
+      this.executionDateTime = executionDateTime != null ? executionDateTime : dt.DateTime.fromJSDate(new Date());
       PopulationContext.__super__.constructor.call(this, this.library, codeService, parameters);
     }
 
@@ -43817,7 +44739,7 @@
 
 
 
-},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../elm/library":25,"../util/util":135,"util":148}],130:[function(require,module,exports){
+},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../elm/library":25,"../util/util":136,"util":149}],131:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Executor, PatientContext, PopulationContext, Results, ref;
@@ -43899,7 +44821,7 @@
 
 
 
-},{"./context":129,"./results":132}],131:[function(require,module,exports){
+},{"./context":130,"./results":133}],132:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Repository, cql;
@@ -43941,7 +44863,7 @@
 
 
 
-},{"../cql":4}],132:[function(require,module,exports){
+},{"../cql":4}],133:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Results;
@@ -43976,7 +44898,7 @@
 
 
 
-},{}],133:[function(require,module,exports){
+},{}],134:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var DateTime, Uncertainty, areDateTimesOrQuantities, areNumbers, classesEqual, codesAreEquivalent, compareEveryItemInArrays, compareObjects, deepCompareKeysAndValues, equals, equivalent, getClassOfObjects, getKeysFromObject, isCode, isFunction, isUncertainty;
@@ -43998,9 +44920,6 @@
   };
 
   module.exports.lessThan = function(a, b, precision) {
-    if (precision == null) {
-      precision = DateTime.Unit.MILLISECOND;
-    }
     switch (false) {
       case !areNumbers(a, b):
         return a < b;
@@ -44016,9 +44935,6 @@
   };
 
   module.exports.lessThanOrEquals = function(a, b, precision) {
-    if (precision == null) {
-      precision = DateTime.Unit.MILLISECOND;
-    }
     switch (false) {
       case !areNumbers(a, b):
         return a <= b;
@@ -44034,9 +44950,6 @@
   };
 
   module.exports.greaterThan = function(a, b, precision) {
-    if (precision == null) {
-      precision = DateTime.Unit.MILLISECOND;
-    }
     switch (false) {
       case !areNumbers(a, b):
         return a > b;
@@ -44052,9 +44965,6 @@
   };
 
   module.exports.greaterThanOrEquals = function(a, b, precision) {
-    if (precision == null) {
-      precision = DateTime.Unit.MILLISECOND;
-    }
     switch (false) {
       case !areNumbers(a, b):
         return a >= b;
@@ -44080,12 +44990,21 @@
     if (isCode(a)) {
       return codesAreEquivalent(a, b);
     }
+    if (a != null ? a.isRatio : void 0) {
+      return a.equivalent(b);
+    }
     ref = getClassOfObjects(a, b), aClass = ref[0], bClass = ref[1];
     switch (aClass) {
       case '[object Array]':
         return compareEveryItemInArrays(a, b, equivalent);
       case '[object Object]':
         return compareObjects(a, b, equivalent);
+      case '[object String]':
+        if (bClass === '[object String]') {
+          return (a.localeCompare(b, 'en', {
+            sensitivity: 'base'
+          })) === 0;
+        }
     }
     return equals(a, b);
   };
@@ -44131,17 +45050,28 @@
 
   deepCompareKeysAndValues = function(a, b, comparisonFunction) {
     var aKeys, bKeys, finalComparisonResult, shouldReturnNull;
-    aKeys = getKeysFromObject(a);
-    bKeys = getKeysFromObject(b);
+    aKeys = getKeysFromObject(a).sort();
+    bKeys = getKeysFromObject(b).sort();
     shouldReturnNull = false;
-    finalComparisonResult = aKeys.length === bKeys.length && aKeys.every(function(key) {
-      var comparisonResult;
-      comparisonResult = comparisonFunction(a[key], b[key]);
-      if (comparisonResult === null) {
-        shouldReturnNull = true;
-      }
-      return comparisonResult;
-    });
+    if (aKeys.length === bKeys.length && aKeys.every((function(_this) {
+      return function(value, index) {
+        return value === bKeys[index];
+      };
+    })(this))) {
+      finalComparisonResult = aKeys.every(function(key) {
+        var comparisonResult;
+        if ((a[key] == null) && (b[key] == null)) {
+          return true;
+        }
+        comparisonResult = comparisonFunction(a[key], b[key]);
+        if (comparisonResult === null) {
+          shouldReturnNull = true;
+        }
+        return comparisonResult;
+      });
+    } else {
+      finalComparisonResult = false;
+    }
     if (shouldReturnNull) {
       return null;
     }
@@ -44175,6 +45105,9 @@
     if (a != null ? a.isQuantity : void 0) {
       return a.equals(b);
     }
+    if (a != null ? a.isRatio : void 0) {
+      return a.equals(b);
+    }
     if (a instanceof Uncertainty) {
       b = Uncertainty.from(b);
     } else if (b instanceof Uncertainty) {
@@ -44214,7 +45147,7 @@
 
 
 
-},{"../datatypes/datetime":7,"../datatypes/uncertainty":11}],134:[function(require,module,exports){
+},{"../datatypes/datetime":7,"../datatypes/uncertainty":11}],135:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var DateTime, Exception, MAX_DATE_VALUE, MAX_FLOAT_VALUE, MAX_INT_VALUE, MAX_TIME_VALUE, MIN_DATE_VALUE, MIN_FLOAT_PRECISION_VALUE, MIN_FLOAT_VALUE, MIN_INT_VALUE, MIN_TIME_VALUE, OverFlowException, Uncertainty, isValidDecimal, isValidInteger, predecessor, successor,
@@ -44247,26 +45180,26 @@
 
   module.exports.isValidInteger = isValidInteger = function(integer) {
     if (isNaN(integer)) {
-      throw new Error("Unable to parse Integer");
+      return false;
     }
     if (integer > MAX_INT_VALUE) {
-      throw new Error("Maximum Integer value exceeded");
+      return false;
     }
     if (integer < MIN_INT_VALUE) {
-      throw new Error("Minimum Integer value exceeded");
+      return false;
     }
     return true;
   };
 
   module.exports.isValidDecimal = isValidDecimal = function(decimal) {
     if (isNaN(decimal)) {
-      throw new Error("Unable to parse Decimal");
+      return false;
     }
     if (decimal > MAX_FLOAT_VALUE) {
-      throw new Error("Maximum Decimal value exceeded");
+      return false;
     }
     if (decimal < MIN_FLOAT_VALUE) {
-      throw new Error("Minimum Decimal value exceeded");
+      return false;
     }
     return true;
   };
@@ -44430,10 +45363,10 @@
 
 
 
-},{"../datatypes/datetime":7,"../datatypes/exception":8,"../datatypes/uncertainty":11}],135:[function(require,module,exports){
+},{"../datatypes/datetime":7,"../datatypes/exception":8,"../datatypes/uncertainty":11}],136:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var typeIsArray;
+  var getTimezoneSeparatorFromString, normalizeMillisecondsField, normalizeMillisecondsFieldInString, typeIsArray;
 
   module.exports.compact = function(things) {
     return things.filter(function(x) {
@@ -44482,11 +45415,42 @@
     }
   };
 
+  module.exports.jsDate = Date;
+
+  module.exports.normalizeMillisecondsFieldInString = normalizeMillisecondsFieldInString = function(string, msString) {
+    var beforeMs, msAndAfter, ref, timezoneField, timezoneSeparator;
+    msString = normalizeMillisecondsField(msString);
+    ref = string.split('.'), beforeMs = ref[0], msAndAfter = ref[1];
+    timezoneSeparator = getTimezoneSeparatorFromString(msAndAfter);
+    if (!!timezoneSeparator) {
+      timezoneField = msAndAfter != null ? msAndAfter.split(timezoneSeparator)[1] : void 0;
+    }
+    if (timezoneField == null) {
+      timezoneField = '';
+    }
+    return string = beforeMs + '.' + msString + timezoneSeparator + timezoneField;
+  };
+
+  module.exports.normalizeMillisecondsField = normalizeMillisecondsField = function(msString) {
+    return msString = (msString + "00").substring(0, 3);
+  };
+
+  module.exports.getTimezoneSeparatorFromString = getTimezoneSeparatorFromString = function(string) {
+    var ref, ref1, timezoneSeparator;
+    if ((string != null ? (ref = string.match(/-/)) != null ? ref.length : void 0 : void 0) === 1) {
+      return timezoneSeparator = '-';
+    } else if ((string != null ? (ref1 = string.match(/\+/)) != null ? ref1.length : void 0 : void 0) === 1) {
+      return timezoneSeparator = '+';
+    } else {
+      return timezoneSeparator = '';
+    }
+  };
+
 }).call(this);
 
 
 
-},{}],136:[function(require,module,exports){
+},{}],137:[function(require,module,exports){
 //! moment.js
 //! version : 2.20.1
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -49023,7 +49987,7 @@ return hooks;
 
 })));
 
-},{}],137:[function(require,module,exports){
+},{}],138:[function(require,module,exports){
 // shim for using process in browser
 var process = module.exports = {};
 
@@ -49209,7 +50173,7 @@ process.chdir = function (dir) {
 };
 process.umask = function() { return 0; };
 
-},{}],138:[function(require,module,exports){
+},{}],139:[function(require,module,exports){
 module.exports={
   "10*": {
     "value": 10,
@@ -50413,10 +51377,10 @@ module.exports={
   }
 }
 
-},{}],139:[function(require,module,exports){
+},{}],140:[function(require,module,exports){
 module.exports={"mol":true,"sr":true,"Hz":true,"N":true,"Pa":true,"J":true,"W":true,"A":true,"V":true,"F":true,"Ohm":true,"S":true,"Wb":true,"Cel":true,"T":true,"H":true,"lm":true,"lx":true,"Bq":true,"Gy":true,"Sv":true,"l":true,"L":true,"ar":true,"t":true,"bar":true,"u":true,"eV":true,"pc":true,"[c]":true,"[h]":true,"[k]":true,"[eps_0]":true,"[mu_0]":true,"[e]":true,"[m_e]":true,"[m_p]":true,"[G]":true,"[g]":true,"[ly]":true,"gf":true,"Ky":true,"Gal":true,"dyn":true,"erg":true,"P":true,"Bi":true,"St":true,"Mx":true,"G":true,"Oe":true,"Gb":true,"sb":true,"Lmb":true,"ph":true,"Ci":true,"R":true,"RAD":true,"REM":true,"cal_[15]":true,"cal_[20]":true,"cal_m":true,"cal_IT":true,"cal_th":true,"cal":true,"tex":true,"m[H2O]":true,"m[Hg]":true,"eq":true,"osm":true,"g%":true,"kat":true,"U":true,"[iU]":true,"[IU]":true,"Np":true,"B":true,"B[SPL]":true,"B[V]":true,"B[mV]":true,"B[uV]":true,"B[10.nV]":true,"B[W]":true,"B[kW]":true,"st":true,"mho":true,"bit":true,"By":true,"Bd":true,"m":true,"s":true,"g":true,"rad":true,"K":true,"C":true,"cd":true}
 
-},{}],140:[function(require,module,exports){
+},{}],141:[function(require,module,exports){
 module.exports={
   "Y": {
     "CODE": "YA",
@@ -50780,7 +51744,7 @@ module.exports={
   }
 }
 
-},{}],141:[function(require,module,exports){
+},{}],142:[function(require,module,exports){
 module.exports={
   "Y": 1e+24,
   "Z": 1e+21,
@@ -50808,7 +51772,7 @@ module.exports={
   "Ti": 1099511627776
 }
 
-},{}],142:[function(require,module,exports){
+},{}],143:[function(require,module,exports){
 module.exports = function () {
   /*
    * Generated by PEG.js 0.8.0.
@@ -51965,7 +52929,7 @@ module.exports = function () {
   };
 }();
 
-},{"../lib/helpers":144,"./metrics.json":139,"./prefixMetadata.json":140,"./prefixes.json":141,"./unitMetadata.json":143}],143:[function(require,module,exports){
+},{"../lib/helpers":145,"./metrics.json":140,"./prefixMetadata.json":141,"./prefixes.json":142,"./unitMetadata.json":144}],144:[function(require,module,exports){
 module.exports={
   "10*": {
     "isBase": false,
@@ -58152,7 +59116,7 @@ module.exports={
   }
 }
 
-},{}],144:[function(require,module,exports){
+},{}],145:[function(require,module,exports){
 module.exports = {
 
   multiply: function multiply(t, ms) {
@@ -58222,7 +59186,7 @@ module.exports = {
   }
 };
 
-},{}],145:[function(require,module,exports){
+},{}],146:[function(require,module,exports){
 parser = require('./generated/ucum-parser.js');
 equivalents = require('./generated/equivalents.json');
 helpers = require('./lib/helpers.js');
@@ -58443,7 +59407,7 @@ function unitQuery(criteria, resultFields) {
   });
 }
 
-},{"./generated/equivalents.json":138,"./generated/ucum-parser.js":142,"./generated/unitMetadata.json":143,"./lib/helpers.js":144}],146:[function(require,module,exports){
+},{"./generated/equivalents.json":139,"./generated/ucum-parser.js":143,"./generated/unitMetadata.json":144,"./lib/helpers.js":145}],147:[function(require,module,exports){
 if (typeof Object.create === 'function') {
   // implementation from standard node.js 'util' module
   module.exports = function inherits(ctor, superCtor) {
@@ -58468,14 +59432,14 @@ if (typeof Object.create === 'function') {
   }
 }
 
-},{}],147:[function(require,module,exports){
+},{}],148:[function(require,module,exports){
 module.exports = function isBuffer(arg) {
   return arg && typeof arg === 'object'
     && typeof arg.copy === 'function'
     && typeof arg.fill === 'function'
     && typeof arg.readUInt8 === 'function';
 }
-},{}],148:[function(require,module,exports){
+},{}],149:[function(require,module,exports){
 (function (process,global){
 // Copyright Joyent, Inc. and other Node contributors.
 //
@@ -59065,4 +60029,4 @@ function hasOwnProperty(obj, prop) {
 }
 
 }).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./support/isBuffer":147,"_process":137,"inherits":146}]},{},[38]);
+},{"./support/isBuffer":148,"_process":138,"inherits":147}]},{},[39]);