Almost done with big bang refactoring.