Added first attempt at storage of the messages