New Version 2.5.0 of Plugin

New version of the plugin. Almost complete rewrite from previous commit.