add inital support for proper message protocol