Flesh out the messaging integ a bit more