refactored and passed first messaging test - sending a message
merge