Reorganizing how the plugin will work