Added wufoo stuff, always having a primary address/email/phone if there is only one, etc