Beginning Ch5.  Fixing domain classes