More work on core.