added contact type switch and general selection, start implementing COMPANY type