More work on the framework.