WIP: Adding in message processing