Trying to get the messaging system sorted out