Add Unit to interval.  Just has to be.  Move AgencyAttribute to the
correct package.  Whoopsie.