A whole shit-ton of changes to make the plugin a log better...