Start changing messages to Message class