Merge pull request #1 from tomrunia/messaging-functionality

Messaging functionality
Worked on the report
Small changes