Trying to get more re-use between standalone and Annotator plugout
Cleanup
First shot at externalizing a Selector API
Refactoring