The return of the plugin

Add a TODO to improve this.