- Some work on the asset and entity classes.