The return of the plugin

As discussed, abiding #152.