Now a proper plugin.