should be making some good progress with messaging
merging