adding messaging system now