handle opportunities on any party, not just organisations.
Also make sure emails work