initial commit, with revisions to original plugin in place