Use simpler Map to hold Contact, eliminate team concept.