Almost done with plugin