First draft of Message support