Last commit before attempting to mess with jar files because joda-time apparently copied 2x
pushing everything for ND review