Major refactor, including new support for normalizing addresses to AP style.
Merge to support refactor.