Post mega refactoring.