adding class Message
merging addName branch