Rearanged the messaging system a bit.