New plugin system - still pretty basic.