Wrapping up the plugin to a working state