More work towards messages