Plugin nearly done