Made more progress on classes.