Major refactoring done, completed without testing