Bleeding merge for massive overhaul

Massive overhaul for the plugin