Make messages from Machine typed. The code does not take advantage of this yet