worked on message sending/refactoring