Some more work on internal framework.