Oops...named to classes the same.  This amends that.  Still working on
randomness.