Plugin system semi-finalized