Continued work on core classes.