Fixed requires.
Did a MAJOR refactoring of the address utilities.