Finished major refactoring.