Merge "Split out doBlockLevels() into its own class"