Make this proper plugin