working on new structure for messaging feauture