Changed db schema.  Added better recipient breakout.