Phone number added
Finish building out support for phone and email
 - add some null checks for safety