New classes.
Updated comments.