Working on updating the plugin to the new plugin standard