Updating to use plugin standard
Initial functionality, untested