Final commit for working plugin