trying to generalize message consumption
Merge branch 'bonnie' of github.com:mkranch/Fake-Switch-Project into bonnie