Phone numbers refactoring

I'm still working on this.