Initial version.  Needs testing with a test plugin