refactoring, skeleton for remaining message types