Added state classes. Deleted first pass on display classes.