DO NOT COMMIT UNTIL PLUGMAN IS REBASED AND THIS HAS BEEN MODIFIED