starting implementation of messaging
merge