working on the messages part