Add classes.

Not building -- need to find errors.