Newbilling

all's good now.  tests updated and pass.