Commit tested and working plugin