This is more work on the plugin system.