Began refracture the plugin
Done cleaning up for now