Almost done refactoring with latest from eVista.