Merge "Moved practically all of the prerefactoring functionality to the new design."