continued refactoring of publisher, breaking down a bit more, etc.