Added the Message class, tbi