Added Phone, tests incomplete