Lots of work on plugin.