More work on messages etc.