Preparing to break into smaller classes