Midway through refactoring