Started adding a Message class