Updated plugin.
Tentatively completed both addition and removal logic, will re-examine in the morning.