Preparing for huge refactoring.