IMO there should be a check to prevent adding billing or shipping adresses here.