added some more code. leaving at removing phoneNumberHelper;