Did some work on these classes.