Much MUCH cleaner plugin implementation.