Factoring out plugins. Hopefully last step.