Initial import.
TESTING: add testing to newly-split out plugins