Working on updating the plugin to the plugin standard