Started to add in support for messages