Started complete reboot of the plugin, organised better structure and have planned out a cleaner layout, will be working on this over the next couple of weeks