adding message functionality
merge
messages partially implemented