More work on classes.