rough code - refactor and add reset

Start consolidating repeated code and simplifying.  Add in missing reset
messages.  Start moving broker-requested events and actions into their
own category.