Refactoring.  In progress.