edited the messaging system, now ready for testing