Refactor

Every plugin hooking to plotme will break...