starting to refactor to sensible method names
cleaned up plugin interface