Message buffering capability added
Basic setup complete, but the functionality is not completed properly