Development

Complete rewrite of the plugin being pushed from the development branch