Some work on internal messaging.