More structure and classes.