This is the way I want to head too. Smart to merge everything for them. My main concern is accounting for other clients doing it wrong.