Working on making the plugin 3.0 ready, all unit tests pass.