Added many of the major classes.