Huge additions to all classes.