more work on the framework